Add support for python version agnostic building

applications/solvers/df0DFoam/CMakeLists.txt

@@ -14,7 +14,7 @@ if(DEFINED ENV{CANTERA_ROOT})
   SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
 else()
 	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
+endif(DEFINED ENV{CANTERA_ROOT})
 
 # define variables
 SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
@@ -29,11 +29,11 @@ SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
+-DNoRepository -ftemplate-depth-100
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX
 -pthread -fPIC")
 add_definitions("${EXE_COMPILE_OPTION}")
 
@@ -47,7 +47,7 @@ FUNCTION(R_SEARCH search_path return_list)
     ENDFOREACH()
     LIST(REMOVE_DUPLICATES dir_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
-ENDFUNCTION(R_SEARCH)  
+ENDFUNCTION(R_SEARCH)
 
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_inc)
@@ -67,31 +67,30 @@ include_directories(
     ${OpenFOAM_SRC}/finiteVolume/lnInclude
     ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
     ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/finiteVolume/cfdTools 
-    ${OpenFOAM_SRC}/finiteVolume/lnInclude 
-    ${OpenFOAM_SRC}/meshTools/lnInclude 
-    ${OpenFOAM_SRC}/sampling/lnInclude 
-    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude 
-    ${OpenFOAM_SRC}/Pstream/mpi 
+    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/finiteVolume/cfdTools
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/meshTools/lnInclude
+    ${OpenFOAM_SRC}/sampling/lnInclude
+    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude
+    ${OpenFOAM_SRC}/Pstream/mpi
     ${dfcantera_inc}
     ${dfchemistry_inc}
     ${dfcombustion_inc}
-    ${CANTERA_ROOT}/include 
+    ${CANTERA_ROOT}/include
     ${MPI_INCLUDE_PATH}
     ${PROJECT_SOURCE_DIR}
 )
 
 # add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/df0DFoam.C)
-
-target_link_libraries(${PROJECT_NAME} 
-    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
+target_link_libraries(${PROJECT_NAME}
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so
     libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.so
-    ${CANTERA_ROOT}/lib/libcantera.so.2
+    ${CANTERA_ROOT}/lib/libcantera.so
     ${DF_ROOT}/lib/libdfChemistryModel.so
     ${DF_ROOT}/lib/libdfCanteraMixture.so
     ${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
@@ -102,14 +101,9 @@ target_link_libraries(${PROJECT_NAME}
 
 if(DEFINED ENV{PYTHON_INC_DIR})
   add_definitions(-DUSE_PYTORCH)
-  find_package (Python REQUIRED COMPONENTS Interpreter Development)
+  # https://pybind11.readthedocs.io/en/stable/advanced/embedding.html
   find_package(pybind11)
-  include_directories(
-  ${Python_INCLUDE_DIRS}
-  ${pybind11_INCLUDE_DIR}/pybind11
-  )
-  target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
-  message(STATUS "pybind libraries" ${Python_LIBRARIES})
+  target_link_libraries(${PROJECT_NAME} pybind11::embed)
 endif()
 
 # install

applications/solvers/df0DFoam/Make/options

@@ -7,19 +7,19 @@ EXE_INC = -std=c++17 \
     $(PFLAGS) $(PINC) \
     $(if $(LIBTORCH_ROOT),-DUSE_LIBTORCH,) \
     $(if $(PYTHON_INC_DIR),-DUSE_PYTORCH,) \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(CANTERA_ROOT)/include \
+    -I$(DF_SRC)/dfCanteraMixture/lnInclude \
+    -I$(DF_SRC)/dfChemistryModel/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/Pstream/mpi \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(DF_SRC)/dfCanteraMixture/lnInclude \
-    -I$(DF_SRC)/dfChemistryModel/lnInclude \
-    -I$(CANTERA_ROOT)/include \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include,) \
     $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include/torch/csrc/api/include,) \
     $(if $(BOOST_ARCH_PATH),-I$(BOOST_ARCH_PATH),) \
@@ -47,5 +47,4 @@ EXE_LIBS = \
     $(if $(LIBTORCH_ROOT),-rdynamic,) \
     $(if $(LIBTORCH_ROOT),-lpthread,) \
     $(if $(LIBTORCH_ROOT),$(DF_SRC)/dfChemistryModel/DNNInferencer/build/libDNNInferencer.so,) \
-    $(if $(PYTHON_LIB_DIR),-L$(PYTHON_LIB_DIR),) \
-    $(if $(PYTHON_LIB_DIR),-lpython3.8,)
+    $(if $(PYTHON_LIB_DIR),$(PYTHON_LIB_DIR),)

applications/solvers/dfHighSpeedFoam/CMakeLists.txt

@@ -14,7 +14,7 @@ if(DEFINED ENV{CANTERA_ROOT})
   SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
 else()
 	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
+endif(DEFINED ENV{CANTERA_ROOT})
 
 # define variables
 SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
@@ -29,11 +29,11 @@ SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
+-DNoRepository -ftemplate-depth-100
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX
 -pthread -fPIC")
 add_definitions("${EXE_COMPILE_OPTION}")
 
@@ -67,30 +67,30 @@ include_directories(
     ${OpenFOAM_SRC}/finiteVolume/lnInclude
     ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
     ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-    $ENV{FOAM_APP}/solvers/compressible/rhoCentralFoam/BCs/lnInclude 
-    ${OpenFOAM_SRC}/finiteVolume/cfdTools 
-    ${OpenFOAM_SRC}/finiteVolume/lnInclude 
-    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/sampling/lnInclude 
-    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude 
-    ${OpenFOAM_SRC}/Pstream/mpi 
-    ${OpenFOAM_SRC}/meshTools/lnInclude 
+    $ENV{FOAM_APP}/solvers/compressible/rhoCentralFoam/BCs/lnInclude
+    ${OpenFOAM_SRC}/finiteVolume/cfdTools
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/sampling/lnInclude
+    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude
+    ${OpenFOAM_SRC}/Pstream/mpi
+    ${OpenFOAM_SRC}/meshTools/lnInclude
     ${dfcantera_inc}
     ${dfchemistry_inc}
     ${dfcombustion_inc}
-    ${CANTERA_ROOT}/include 
+    ${CANTERA_ROOT}/include
     ${MPI_INCLUDE_PATH}
     ${PROJECT_SOURCE_DIR}
 )
 
 # add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/dfHighSpeedFoam.C)
 
-target_link_libraries(${PROJECT_NAME} 
-    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
+target_link_libraries(${PROJECT_NAME}
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so
     libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.so libtopoChangerFvMesh.so
     ${CANTERA_ROOT}/lib/libcantera_shared.so.2
     ${DF_ROOT}/lib/libdfChemistryModel.so
@@ -103,14 +103,9 @@ target_link_libraries(${PROJECT_NAME}
 
 if(DEFINED ENV{PYTHON_INC_DIR})
   add_definitions(-DUSE_PYTORCH)
-  find_package (Python REQUIRED COMPONENTS Interpreter Development)
+  # https://pybind11.readthedocs.io/en/stable/advanced/embedding.html
   find_package(pybind11)
-  include_directories(
-  ${Python_INCLUDE_DIRS}
-  ${pybind11_INCLUDE_DIR}/pybind11
-  )
-  target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
-  message(STATUS "pybind libraries" ${Python_LIBRARIES})
+  target_link_libraries(${PROJECT_NAME} pybind11::embed)
 endif()
 
 # install

applications/solvers/dfHighSpeedFoam/Make/options

@@ -7,21 +7,21 @@ EXE_INC = -std=c++17 \
     $(PFLAGS) $(PINC) \
     $(if $(LIBTORCH_ROOT),-DUSE_LIBTORCH,) \
     $(if $(PYTHON_INC_DIR),-DUSE_PYTORCH,) \
+    -I$(CANTERA_ROOT)/include \
+    -I$(DF_SRC)/dfCanteraMixture/lnInclude \
+    -I$(DF_SRC)/dfChemistryModel/lnInclude \
+    -I$(DF_SRC)/dfCombustionModels/lnInclude \
     -I$(FOAM_APP)/solvers/compressible/rhoCentralFoam/BCs/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/Pstream/mpi \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/Pstream/mpi \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(DF_SRC)/dfCanteraMixture/lnInclude \
-    -I$(DF_SRC)/dfChemistryModel/lnInclude \
-    -I$(DF_SRC)/dfCombustionModels/lnInclude \
-    -I$(CANTERA_ROOT)/include \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include,) \
     $(if $(LIBTORCH_ROOT),-I$(LIBTORCH_ROOT)/include/torch/csrc/api/include,) \
     $(PYTHON_INC_DIR)
@@ -45,5 +45,4 @@ EXE_LIBS = \
     $(if $(LIBTORCH_ROOT),-rdynamic,) \
     $(if $(LIBTORCH_ROOT),-lpthread,) \
     $(if $(LIBTORCH_ROOT),$(DF_SRC)/dfChemistryModel/DNNInferencer/build/libDNNInferencer.so,) \
-    $(if $(PYTHON_LIB_DIR),-L$(PYTHON_LIB_DIR),) \
-    $(if $(PYTHON_LIB_DIR),-lpython3.8,)
+    $(if $(PYTHON_LIB_DIR),$(PYTHON_LIB_DIR),)

applications/solvers/dfLowMachFoam/CMakeLists.txt

@@ -16,7 +16,7 @@ if(DEFINED ENV{CANTERA_ROOT})
   SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
 else()
 	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
+endif(DEFINED ENV{CANTERA_ROOT})
 
 # define variables
 SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
@@ -33,11 +33,11 @@ SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS})
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
+-DNoRepository -ftemplate-depth-100
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX
 -pthread -fPIC")
 add_definitions("${EXE_COMPILE_OPTION}")
 
@@ -71,20 +71,20 @@ include_directories(
     ${OpenFOAM_SRC}/finiteVolume/lnInclude
     ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
     ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude 
-    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude 
-    ${OpenFOAM_SRC}/finiteVolume/cfdTools 
-    ${OpenFOAM_SRC}/finiteVolume/lnInclude 
-    ${OpenFOAM_SRC}/meshTools/lnInclude 
-    ${OpenFOAM_SRC}/sampling/lnInclude 
-    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude 
-    ${OpenFOAM_SRC}/Pstream/mpi 
+    ${OpenFOAM_SRC}/transportModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude
+    ${OpenFOAM_SRC}/TurbulenceModels/compressible/lnInclude
+    ${OpenFOAM_SRC}/finiteVolume/cfdTools
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/meshTools/lnInclude
+    ${OpenFOAM_SRC}/sampling/lnInclude
+    ${OpenFOAM_SRC}/dynamicFvMesh/lnInclude
+    ${OpenFOAM_SRC}/Pstream/mpi
     ${dfcantera_inc}
     ${dfchemistry_inc}
     ${dfcombustion_inc}
-    ${CANTERA_ROOT}/include 
+    ${CANTERA_ROOT}/include
     ${MPI_INCLUDE_PATH}
     ${PROJECT_SOURCE_DIR}
     ${CUDA_INCLUDE_DIRS}
@@ -95,9 +95,9 @@ include_directories(
 # add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/dfLowMachFoam.C)
 
-target_link_libraries(${PROJECT_NAME} 
-    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
-    libturbulenceModels.so libsampling.so libOpenFOAM.so 
+target_link_libraries(${PROJECT_NAME}
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so
+    libturbulenceModels.so libsampling.so libOpenFOAM.so
     ${CANTERA_ROOT}/lib/libcantera_shared.so.2
     ${DF_ROOT}/lib/libdfChemistryModel.so
     ${DF_ROOT}/lib/libdfCanteraMixture.so
@@ -111,14 +111,10 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 if(DEFINED ENV{PYTHON_INC_DIR})
-    add_definitions(-DUSE_PYTORCH)
-    find_package (Python REQUIRED COMPONENTS Interpreter Development)
-    find_package(pybind11)
-    include_directories(
-    ${Python_INCLUDE_DIRS}
-    ${pybind11_INCLUDE_DIR}/pybind11
-    )
-    target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
+  add_definitions(-DUSE_PYTORCH)
+  # https://pybind11.readthedocs.io/en/stable/advanced/embedding.html
+  find_package(pybind11)
+  target_link_libraries(${PROJECT_NAME} pybind11::embed)
 endif()
 
 # install

applications/solvers/dfLowMachFoam/Make/options

@@ -49,9 +49,7 @@ EXE_LIBS = \
     $(if $(LIBTORCH_ROOT),-rdynamic,) \
     $(if $(LIBTORCH_ROOT),-lpthread,) \
     $(if $(LIBTORCH_ROOT),$(DF_SRC)/dfChemistryModel/DNNInferencer/build/libDNNInferencer.so,) \
-    $(if $(PYTHON_LIB_DIR),-L$(PYTHON_LIB_DIR),) \
-    $(if $(PYTHON_LIB_DIR),-lpython3.8,) \
+    $(if $(PYTHON_LIB_DIR),$(PYTHON_LIB_DIR),) \
     $(if $(AMGX_DIR), /usr/local/cuda-11.6/lib64/libcudart.so,) \
     $(if $(AMGX_DIR), $(DF_ROOT)/src_gpu/build/libdfMatrix.so,) \
     $(if $(AMGX_DIR), $(AMGX_DIR)/build/libamgxsh.so,)
-