move torch

chengcli · Jul 8, 2024 · 0c267d1 · 0c267d1
1 parent b4ce973
commit 0c267d1
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,8 +58,8 @@ endif()
 message(STATUS "Include ${CMAKE_CURRENT_SOURCE_DIR}/cmake/parameters.cmake")
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/parameters.cmake)
 find_package(Eigen3 REQUIRED)
-find_package(Torch REQUIRED)
 find_package(Cantera)
+#find_package(Torch)
 
 ## 3. set up project system libraries ##
 message(STATUS "3. Set up system libraries")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,7 +61,11 @@ add_subdirectory(special)
 add_subdirectory(single_column)
 add_subdirectory(diagnostics)
 add_subdirectory(forcing)
-add_subdirectory(modules)
+
+if (${Torch_FOUND})
+  add_subdirectory(torch)
+  add_subdirectory(modules)
+endif()
 #add_subdirectory(nbody)
 
 set(CANOE_LIBRARY_${buildu}
@@ -86,7 +90,7 @@ set(CANOE_LIBRARY_${buildu}
   "scm_${buildl}"
   "diagnostics_${buildl}"
   "forcing_${buildl}"
-  "modules_${buildl}"
+  #"modules_${buildl}"
   ${YAML_CPP_LIBRARIES}
   ${CPPDISORT_LIBRARY_${buildu}}
   ${PYTHON_LIBRARY_RELEASE}

diff --git a/src/torch/CMakeLists.txt b/src/torch/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(namel torch)
+string(TOUPPER ${namel} nameu)
+
+file(GLOB src_files
+    eos/*.cpp
+    hydro/*.cpp
+    riemann/*.cpp
+    recon/*.cpp
+    column/*.cpp
+    )
+
+string(TOLOWER ${CMAKE_BUILD_TYPE} buildl)
+string(TOUPPER ${CMAKE_BUILD_TYPE} buildu)
+
+add_library(${namel}_${buildl}
+    OBJECT
+    ${src_files}
+    )
+
+set_target_properties(${namel}_${buildl}
+    PROPERTIES
+    COMPILE_FLAGS ${CMAKE_CXX_FLAGS_${buildu}}
+    )
+
+target_include_directories(${namel}_${buildl}
+    PRIVATE
+    ${EIGEN3_INCLUDE_DIR}
+    )
diff --git a/src/snap/decomposition/decom.cpp → src/torch/column/decom.cpp b/src/snap/decomposition/decom.cpp → src/torch/column/decom.cpp
diff --git a/src/snap/decomposition/decom.hpp → src/torch/column/decom.hpp b/src/snap/decomposition/decom.hpp → src/torch/column/decom.hpp
diff --git a/src/snap/eos/eos.cpp → src/torch/eos/eos.cpp b/src/snap/eos/eos.cpp → src/torch/eos/eos.cpp
diff --git a/src/snap/eos/eos.hpp → src/torch/eos/eos.hpp b/src/snap/eos/eos.hpp → src/torch/eos/eos.hpp
diff --git a/src/snap/eos/eos_hydro_ideal.cpp → src/torch/eos/eos_hydro_ideal.cpp b/src/snap/eos/eos_hydro_ideal.cpp → src/torch/eos/eos_hydro_ideal.cpp
diff --git a/src/exo3/exo3.cpp → src/torch/exo3/exo3.cpp b/src/exo3/exo3.cpp → src/torch/exo3/exo3.cpp
diff --git a/src/exo3/exo3.hpp → src/torch/exo3/exo3.hpp b/src/exo3/exo3.hpp → src/torch/exo3/exo3.hpp
diff --git a/src/snap/hydro/flux_divergence.cpp → src/torch/hydro/flux_divergence.cpp b/src/snap/hydro/flux_divergence.cpp → src/torch/hydro/flux_divergence.cpp
diff --git a/src/snap/hydro/hydro.hpp → src/torch/hydro/hydro.hpp b/src/snap/hydro/hydro.hpp → src/torch/hydro/hydro.hpp
diff --git a/src/snap/reconstruct/interpolation.cpp → src/torch/recon/interpolation.cpp b/src/snap/reconstruct/interpolation.cpp → src/torch/recon/interpolation.cpp
diff --git a/src/snap/reconstruct/interpolation.hpp → src/torch/recon/interpolation.hpp b/src/snap/reconstruct/interpolation.hpp → src/torch/recon/interpolation.hpp
diff --git a/src/snap/reconstruct/recon.hpp → src/torch/recon/recon.hpp b/src/snap/reconstruct/recon.hpp → src/torch/recon/recon.hpp
diff --git a/src/snap/reconstruct/weno5.cpp → src/torch/recon/weno5.cpp b/src/snap/reconstruct/weno5.cpp → src/torch/recon/weno5.cpp
diff --git a/src/snap/riemann/riemann.cpp → src/torch/riemann/riemann.cpp b/src/snap/riemann/riemann.cpp → src/torch/riemann/riemann.cpp
diff --git a/src/snap/riemann/riemann.hpp → src/torch/riemann/riemann.hpp b/src/snap/riemann/riemann.hpp → src/torch/riemann/riemann.hpp
diff --git a/src/snap/riemann/rs_hydro_lmars.cpp → src/torch/riemann/rs_hydro_lmars.cpp b/src/snap/riemann/rs_hydro_lmars.cpp → src/torch/riemann/rs_hydro_lmars.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -8,11 +8,13 @@ configure_file(globals.cpp.in globals.cpp @ONLY)
 enable_testing()
 
 # torch tests
-setup_test(test_eos)
-setup_test(test_weno)
-setup_test(test_reconstruct)
-setup_test(test_riemann)
-setup_test(test_hydro)
+if (${Torch_FOUND})
+  setup_test(test_eos)
+  setup_test(test_weno)
+  setup_test(test_reconstruct)
+  setup_test(test_riemann)
+  setup_test(test_hydro)
+endif()
 
 # athena tests
 setup_test(test_mesh)