Skip to content
Snippets Groups Projects
Commit a7c73cc1 authored by Carl Philipp Klemm's avatar Carl Philipp Klemm
Browse files

Port to kisstype

parent 4bc59ba1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 6
− 5
View file @ a7c73cc1
......@@ -12,6 +12,7 @@ find_package(PkgConfig)
find_package(Torch)
if(DEFINED PKGCONFIG_FOUND)
pkg_search_module(TYPE libkisstype)
pkg_search_module(EIS libeisgenerator)
endif(DEFINED PKGCONFIG_FOUND)
......@@ -50,7 +51,7 @@ else (DOXYGEN_FOUND)
endif (DOXYGEN_FOUND)
add_library(${PROJECT_NAME} SHARED drt.cpp)
target_link_libraries(${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES} -leisgenerator)
target_link_libraries(${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES} ${TYPE_LIBRARIES})
target_include_directories(${PROJECT_NAME} PUBLIC ${EIGEN3_INCLUDE_DIRS} ${EIS_INCLUDE_DIRS} ./LBFG)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 -march=native -g" LINK_FLAGS "-flto")
install(TARGETS ${PROJECT_NAME} DESTINATION lib)
......@@ -58,7 +59,7 @@ install(TARGETS ${PROJECT_NAME} DESTINATION lib)
if(DEFINED TORCH_LIBRARIES)
message("torch support enabled")
add_library(${PROJECT_NAME}_torch SHARED torchdrt.cpp)
target_link_libraries(${PROJECT_NAME}_torch ${TORCH_LIBRARIES} ${EIGEN3_LIBRARIES} ${PROJECT_NAME} ${EIS_LIBRARIES})
target_link_libraries(${PROJECT_NAME}_torch ${TORCH_LIBRARIES} ${EIGEN3_LIBRARIES} ${PROJECT_NAME} ${EIS_LIBRARIES} ${TYPE_LIBRARIES})
target_include_directories(${PROJECT_NAME}_torch PUBLIC ${TORCH_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${EIS_INCLUDE_DIRS} ./LBFG)
set_target_properties(${PROJECT_NAME}_torch PROPERTIES COMPILE_FLAGS "-Wall -O2 -march=native -g" LINK_FLAGS "-flto")
install(TARGETS ${PROJECT_NAME}_torch DESTINATION lib)
......@@ -71,14 +72,14 @@ if(DEFINED EIS_FOUND)
link_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(${PROJECT_NAME}_test main.cpp)
add_dependencies(${PROJECT_NAME}_test ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}_test -l${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES})
target_link_libraries(${PROJECT_NAME}_test -l${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES} ${TYPE_LIBRARIES})
target_include_directories(${PROJECT_NAME}_test PRIVATE . ${EIGEN3_INCLUDE_DIRS} ${EIS_INCLUDE_DIRS})
set_target_properties(${PROJECT_NAME}_test PROPERTIES COMPILE_FLAGS "-Wall -O2 -march=native -g" LINK_FLAGS "-flto")
link_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(${PROJECT_NAME}_cli cli.cpp)
add_dependencies(${PROJECT_NAME}_cli ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}_cli -l${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES})
target_link_libraries(${PROJECT_NAME}_cli -l${PROJECT_NAME} ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES} ${TYPE_LIBRARIES})
target_include_directories(${PROJECT_NAME}_cli PRIVATE . ${EIGEN3_INCLUDE_DIRS} ${EIS_INCLUDE_DIRS})
set_target_properties(${PROJECT_NAME}_cli PROPERTIES COMPILE_FLAGS "-Wall -O2 -march=native -g" LINK_FLAGS "-flto")
install(TARGETS ${PROJECT_NAME}_cli DESTINATION bin)
......@@ -87,7 +88,7 @@ if(DEFINED EIS_FOUND)
link_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(${PROJECT_NAME}_test_torch testtorchdrt.cpp eistotorch.cpp)
add_dependencies(${PROJECT_NAME}_test_torch ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}_test_torch ${PROJECT_NAME}_torch ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES})
target_link_libraries(${PROJECT_NAME}_test_torch ${PROJECT_NAME}_torch ${EIGEN3_LIBRARIES} ${EIS_LIBRARIES} ${TYPE_LIBRARIES})
target_include_directories(${PROJECT_NAME}_test_torch PRIVATE . ${EIGEN3_INCLUDE_DIRS} ${EIS_INCLUDE_DIRS})
set_target_properties(${PROJECT_NAME}_test_torch PROPERTIES COMPILE_FLAGS "-Wall -O2 -march=native -g" LINK_FLAGS "-flto")
endif(DEFINED TORCH_LIBRARIES)
......
cli.cpp
+ 9
− 14
View file @ a7c73cc1
......@@ -19,7 +19,8 @@
//
#include <iostream>
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include <kisstype/spectra.h>
#include "eisdrt/eisdrt.h"
......@@ -40,10 +41,10 @@ static void print_drt(const std::vector<fvalue>& data)
std::cout<<"]\n";
}
static eis::EisSpectra transform_to_drt_spectra(const std::vector<fvalue>& drt, const eis::EisSpectra& spectra)
static eis::Spectra transform_to_drt_spectra(const std::vector<fvalue>& drt, const eis::Spectra& spectra)
{
assert(spectra.data.size() == drt.size());
eis::EisSpectra drtSpectra = spectra;
eis::Spectra drtSpectra = spectra;
drtSpectra.data.clear();
drtSpectra.data.reserve(drt.size());
......@@ -70,18 +71,18 @@ int main(int argc, char** argv)
try
{
eis::EisSpectra spectra;
eis::Spectra spectra;
if(std::string(argv[1]) != "-")
{
if(!toStdout)
std::cout<<"Loading spectra\n";
spectra = eis::EisSpectra::loadFromDisk(argv[1]);
spectra = eis::Spectra::loadFromDisk(argv[1]);
}
else
{
if(!toStdout)
std::cout<<"Waiting for spectra on stdin\n";
spectra = eis::EisSpectra::loadFromStream(std::cin);
spectra = eis::Spectra::loadFromStream(std::cin);
}
if(!toStdout)
......@@ -95,17 +96,11 @@ int main(int argc, char** argv)
print_drt(drt);
}
eis::EisSpectra drtSpectra = transform_to_drt_spectra(drt, spectra);
bool ret = true;
eis::Spectra drtSpectra = transform_to_drt_spectra(drt, spectra);
if(!toStdout)
ret = drtSpectra.saveToDisk(argv[2]);
drtSpectra.saveToDisk(argv[2]);
else
drtSpectra.saveToStream(std::cout);
if(!ret)
{
std::cerr<<"Could not save spectra to "<<argv[2]<<'\n';
return 1;
}
}
catch(const eis::file_error& err)
{
......
drt.cpp
+ 0
− 2
View file @ a7c73cc1
......@@ -29,8 +29,6 @@
#include <Eigen/Core>
#include <Eigen/StdVector>
#include <eisgenerator/eistype.h>
#include <iostream>
#include "Eigen/src/Core/Matrix.h"
#include "LBFG/LBFGSB.h"
......
eigentorchconversions.h
+ 0
− 1
View file @ a7c73cc1
......@@ -19,7 +19,6 @@
#include <c10/core/ScalarType.h>
#include <climits>
#include <eisgenerator/eistype.h>
#include <sys/types.h>
#include <torch/torch.h>
#include <Eigen/Dense>
......
eisdrt/eisdrt.h
+ 1
− 1
View file @ a7c73cc1
......@@ -17,7 +17,7 @@
* along with libeisdrt. If not, see <http://www.gnu.org/licenses/>.
*/
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include <vector>
#include "types.h"
......
eisdrt/eistorchdrt.h
+ 1
− 1
View file @ a7c73cc1
......@@ -17,7 +17,7 @@
* along with libeisdrt. If not, see <http://www.gnu.org/licenses/>.
*/
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include "torchdrt.h"
......
eistoeigen.h
+ 1
− 1
View file @ a7c73cc1
......@@ -23,7 +23,7 @@
#include "Eigen/src/Core/Matrix.h"
#include <Eigen/Core>
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include <vector>
Eigen::VectorX<std::complex<fvalue>> eistoeigen(const std::vector<eis::DataPoint>& data, Eigen::Vector<fvalue, Eigen::Dynamic>* omega = nullptr)
......
eistotorch.h
+ 1
− 1
View file @ a7c73cc1
......@@ -19,7 +19,7 @@
#pragma once
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include <torch/torch.h>
#include <vector>
......
main.cpp
+ 1
− 1
View file @ a7c73cc1
......@@ -20,7 +20,7 @@
#include <iostream>
#include <eisgenerator/model.h>
#include <eisgenerator/eistype.h>
#include <kisstype/type.h>
#include <eisgenerator/basicmath.h>
#include "eisdrt/eisdrt.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment