Catalyst Adaptor: Update configuration pipeline.

mosaic-group · Apr 13, 2024 · c454d54 · c454d54
1 parent 1198879
commit c454d54
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,7 @@ set(METIS_ROOT CACHE PATH "Metis root directory")
 set(LIBHILBERT_ROOT CACHE PATH "LibHilbert root path")
 set(HDF5_ROOT CACHE PATH "HDF5 root path")
 set(TINYOBJLOADER_ROOT CACHE PATH "TinyObjLoader library path")
+set(catalyst_DIR CACHE PATH "Catalyst library path")
 set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
 set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")
 set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
@@ -50,6 +51,7 @@ find_package(TinyObjLoader)
 find_package(MPI REQUIRED)
 find_package(METIS)
 find_package(ParMETIS)
+find_package(catalyst 2.0)
 
 if (CUDA_ON_BACKEND STREQUAL "HIP")
 	find_package(HIP)
@@ -311,4 +313,4 @@ include(CPack)
 
 cpack_add_component(OpenFPM
 		    DISPLAY_NAME OpenFPM
-		    DESCRITION OpenFPM binary files)
+		    DESCRITION OpenFPM binary files)
diff --git a/script/conf_CMake.sh b/script/conf_CMake.sh
@@ -160,7 +160,11 @@ if [ -d "$prefix_dependencies/EIGEN" ]; then
     configure_options=" $configure_options -DEIGEN3_ROOT=$prefix_dependencies/EIGEN "
 fi
 
+if [ -d "$i_dir/CATALYST/lib" ]; then
+  configure_options=" $configure_options -Dcatalyst_DIR=$prefix_dependencies/CATALYST/lib/cmake/catalyst-2.0 "
+elif [ -d "$i_dir/CATALYST/lib64" ]; then
+  configure_options=" $configure_options -Dcatalyst_DIR=$prefix_dependencies/CATALYST/lib64/cmake/catalyst-2.0 "
+fi
 
 echo "CXX=mpic++ DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $configure_options"
-printf "CXX=mpic++ DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $configure_options" > cmake_build_options
-
+printf "CXX=mpic++ DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $configure_options" > cmake_build_options
diff --git a/script/create_env_vars.sh b/script/create_env_vars.sh
@@ -50,6 +50,12 @@ if [ -d "$prefix_dependencies/SUITESPARSE"  -a -f "$prefix_dependencies/SUITESPA
   bash_library="$bash_library:$prefix_dependencies/SUITESPARSE/lib"
 fi
 
+if [ -d "$prefix_dependencies/CATALYST/lib" ]; then
+  bash_library="$bash_library:$prefix_dependencies/CATALYST/lib"
+elif [ -d "$prefix_dependencies/CATALYST/lib64" ]; then
+  bash_library="$bash_library:$prefix_dependencies/CATALYST/lib64"
+fi
+
 # in cygwin we have to add to PATH additional directories
 if [[ "$OSTYPE" == "cygwin" ]]; then
 	bash_path="$bash_path:$prefix_dependencies/BOOST/bin:$prefix_dependencies/HDF5/bin"
@@ -62,4 +68,4 @@ bash_library="$bash_library\""
 
 echo "$bash_path" > openfpm_vars
 echo "$bash_library" >> openfpm_vars
-echo "export PURE_PYTHON=1" >> openfpm_vars
+echo "export PURE_PYTHON=1" >> openfpm_vars
diff --git a/script/create_example.mk.sh b/script/create_example.mk.sh
@@ -54,11 +54,19 @@ if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "linux" ]]; then
     lin_alg_lib="$lin_alg_lib -lrt"
 fi
 
-echo "INCLUDE_PATH=$mpi_include_dirs $cuda_include_dirs $openmp_flags  -I.  -I$prefix_openfpm/openfpm_numerics/include -I$prefix_openfpm/openfpm_pdata/include/config -I$prefix_openfpm/openfpm_pdata/include -I$prefix_openfpm/openfpm_data/include -I$prefix_openfpm/openfpm_vcluster/include -I$prefix_openfpm/openfpm_io/include -I$prefix_openfpm/openfpm_devices/include -I$prefix_dependencies/VCDEVEL/include  -I$prefix_dependencies/METIS/include -I$prefix_dependencies/PARMETIS/include -I$prefix_dependencies/BOOST/include -I$prefix_dependencies/HDF5/include -I$prefix_dependencies/LIBHILBERT/include  $lin_alg_inc -I$prefix_dependencies/BLITZ/include -I$prefix_dependencies/ALGOIM/include  -I$prefix_dependencies/SUITESPARSE/include " > example.mk
-echo "LIBS_PATH=$mpi_libs -L$prefix_openfpm/openfpm_devices/lib -L$prefix_openfpm/openfpm_pdata/lib  -L$prefix_openfpm/openfpm_vcluster/lib -L$prefix_dependencies/VCDEVEL/lib  -L$prefix_dependencies/METIS/lib -L$prefix_dependencies/PARMETIS/lib  -L$prefix_dependencies/BOOST/lib $hdf5_lib_dir -L$prefix_dependencies/LIBHILBERT/lib  $lin_alg_dir " >> example.mk
+if [ -d "$prefix_dependencies/CATALYST/lib" ]; then
+  catalyst_lib=$prefix_dependencies/CATALYST/lib
+  catalyst_lib_dir=-L$prefix_dependencies/CATALYST/lib
+elif [ -d "$prefix_dependencies/CATALYST/lib64" ]; then
+  catalyst_lib=$prefix_dependencies/CATALYST/lib64
+  catalyst_lib_dir=-L$prefix_dependencies/CATALYST/lib64
+fi
+
+echo "INCLUDE_PATH=$mpi_include_dirs $cuda_include_dirs $openmp_flags  -I.  -I$prefix_openfpm/openfpm_numerics/include -I$prefix_openfpm/openfpm_pdata/include/config -I$prefix_openfpm/openfpm_pdata/include -I$prefix_openfpm/openfpm_data/include -I$prefix_openfpm/openfpm_vcluster/include -I$prefix_openfpm/openfpm_io/include -I$prefix_openfpm/openfpm_devices/include -I$prefix_dependencies/VCDEVEL/include  -I$prefix_dependencies/METIS/include -I$prefix_dependencies/PARMETIS/include -I$prefix_dependencies/BOOST/include -I$prefix_dependencies/HDF5/include -I$prefix_dependencies/LIBHILBERT/include  $lin_alg_inc -I$prefix_dependencies/BLITZ/include -I$prefix_dependencies/ALGOIM/include  -I$prefix_dependencies/SUITESPARSE/include -I$prefix_dependencies/CATALYST/include/catalyst-2.0 " > example.mk
+echo "LIBS_PATH=$mpi_libs -L$prefix_openfpm/openfpm_devices/lib -L$prefix_openfpm/openfpm_pdata/lib  -L$prefix_openfpm/openfpm_vcluster/lib -L$prefix_dependencies/VCDEVEL/lib  -L$prefix_dependencies/METIS/lib -L$prefix_dependencies/PARMETIS/lib  -L$prefix_dependencies/BOOST/lib $hdf5_lib_dir -L$prefix_dependencies/LIBHILBERT/lib  $lin_alg_dir $catalyst_lib_dir " >> example.mk
 if [ x"$cuda_on_cpu" == x"YES" ]; then
    echo "CUDA_ON_CPU=YES" >> example.mk
 fi
-echo "LIBS=$openmp_flags $mpi_libs $openmp_libs -lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert -lVc  $cuda_lib $lin_alg_lib -ldl -lboost_filesystem -lboost_system $optional_boost" >> example.mk
-echo "LIBS_NVCC=-Xcompiler=$openmp_flags $mpi_libs -lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert -lVc  $cuda_lib $lin_alg_lib -ldl -lboost_filesystem -lboost_system $optional_boost" >> example.mk
-echo "INCLUDE_PATH_NVCC=-Xcompiler=$openmp_flags "$cuda_options" $mpi_include_dirs -I. -I$prefix_openfpm/openfpm_numerics/include -I$prefix_openfpm/openfpm_pdata/include/config -I$prefix_openfpm/openfpm_pdata/include -I$prefix_openfpm/openfpm_data/include -I$prefix_openfpm/openfpm_vcluster/include -I$prefix_openfpm/openfpm_io/include -I$prefix_openfpm/openfpm_devices/include -I$prefix_dependencies/METIS/include -I$prefix_dependencies/PARMETIS/include -I$prefix_dependencies/BOOST/include -I$prefix_dependencies/HDF5/include -I$prefix_dependencies/LIBHILBERT/include  $lin_alg_inc -I$prefix_dependencies/BLITZ/include -I$prefix_dependencies/ALGOIM/include  -I$prefix_dependencies/SUITESPARSE/include " >> example.mk
+echo "LIBS=$openmp_flags $mpi_libs $openmp_libs -lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert -lVc  $cuda_lib $lin_alg_lib -ldl -lboost_filesystem -lboost_system $optional_boost -lcatalyst" >> example.mk
+echo "LIBS_NVCC=-Xcompiler=$openmp_flags $mpi_libs -lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert -lVc  $cuda_lib $lin_alg_lib -ldl -lboost_filesystem -lboost_system $optional_boost -lcatalyst" >> example.mk
+echo "INCLUDE_PATH_NVCC=-Xcompiler=$openmp_flags "$cuda_options" $mpi_include_dirs -I. -I$prefix_openfpm/openfpm_numerics/include -I$prefix_openfpm/openfpm_pdata/include/config -I$prefix_openfpm/openfpm_pdata/include -I$prefix_openfpm/openfpm_data/include -I$prefix_openfpm/openfpm_vcluster/include -I$prefix_openfpm/openfpm_io/include -I$prefix_openfpm/openfpm_devices/include -I$prefix_dependencies/METIS/include -I$prefix_dependencies/PARMETIS/include -I$prefix_dependencies/BOOST/include -I$prefix_dependencies/HDF5/include -I$prefix_dependencies/LIBHILBERT/include  $lin_alg_inc -I$prefix_dependencies/BLITZ/include -I$prefix_dependencies/ALGOIM/include  -I$prefix_dependencies/SUITESPARSE/include -I$prefix_dependencies/CATALYST/include/catalyst-2.0 " >> example.mk
diff --git a/script/install_CATALYST.sh b/script/install_CATALYST.sh
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+rm -rf catalyst
+git clone https://gitlab.kitware.com/paraview/catalyst.git
+cd catalyst
+mkdir build && cd build
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$1/CATALYST ..
+make -j $2
+make install