Fix some external packages (#185)

chengcli · Dec 7, 2024 · 8fc2add · 8fc2add
1 parent 03102a9
commit 8fc2add
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
@@ -9,13 +9,18 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   set(CMAKE_CXX_FLAGS_RELEASE
-      "-O3 -funroll-loops -funroll-all-loops -fstrict-aliasing")
+      "-O3 -funroll-loops -funroll-all-loops -fstrict-aliasing -pthread")
   set(CMAKE_C_FLAGS_RELEASE
-      "-O3 -funroll-loops -funroll-all-loops -fstrict-aliasing")
+      "-O3 -funroll-loops -funroll-all-loops -fstrict-aliasing -pthread")
 
   set(CMAKE_CXX_FLAGS_DEBUG "-g3")
   set(CMAKE_C_FLAGS_DEBUG "-g3")
 
+  set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} -D_GLIBCXX_USE_CXX11_ABI=0")
+  set(CMAKE_CXX_FLAGS_DEBUG
+      "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_USE_CXX11_ABI=0")
+
   # set(CMAKE_Fortran_FLAGS_RELEASE "-O3" )
   set(KNOWN_COMPILER TRUE)
 endif()
@@ -37,10 +42,8 @@ endif()
 if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   add_link_options("-fuse-ld=lld")
   set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-  set(CMAKE_CXX_FLAGS_RELEASE
-      "-O3 -lstdc++")
-  set(CMAKE_C_FLAGS_RELEASE
-      "-O3 -lstdc++")
+  set(CMAKE_CXX_FLAGS_RELEASE "-O3 -lstdc++")
+  set(CMAKE_C_FLAGS_RELEASE "-O3 -lstdc++")
 
   set(CMAKE_CXX_FLAGS_DEBUG "-g3")
   set(CMAKE_C_FLAGS_DEBUG "-g3")

diff --git a/external/install_cantera.sh b/external/install_cantera.sh
@@ -2,22 +2,24 @@
 
 CXX=g++
 CC=gcc
-cxx_flags=-std=c++17
 prefix=${HOME}/opt/
+boost_inc_dir=`pwd`/cantera/ext/cliboost/
 python_package=y
 f90_interface=n
 system_eigen=n
 system_blas_lapack=n
-boost_inc_dir=`pwd`/cantera/ext/cliboost/
+hdf_support=n
 
 cd cantera
 git submodule init ext/cliboost
 git submodule update ext/cliboost
 
-scons build CXX=${CXX} CC=${CC} cxx_flags=${cxx_flags} prefix=${prefix} \
+scons build CXX=${CXX} CC=${CC} cxx_flags="-std=c++17 -D_GLIBCXX_USE_CXX11_ABI=0" \
   python_package=${python_package} f90_interface=${f90_interface} \
   system_eigen=${system_eigen} \
   system_blas_lapack=${system_blas_lapack} \
-  boost_inc_dir=${boost_inc_dir} -j8
+  hdf_support=${hdf_support} \
+  prefix="${prefix}" \
+  boost_inc_dir="${boost_inc_dir}" -j8
 scons install
 cd ..
diff --git a/requirements.txt b/requirements.txt
@@ -16,3 +16,4 @@ scons
 sphinx_rtd_theme
 torch
 tqdm
+wheel
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ scons @@
     sphinx_rtd_theme
     torch
     tqdm
+    wheel