Skip to content

Commit 88c1c8b

Browse files
anderkveanderkve
authored
Merge pull request #594 from GambitBSM/FindPython_follow_up
Update some now-deprecated Python cmake variable names.
2 parents 885ca08 + 1caa950 commit 88c1c8b

6 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎ScannerBit/python/cmake/modules/FindNumPy.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

2-
if (PYTHON_EXECUTABLE)
2+
if (Python3_EXECUTABLE)
33
execute_process (
4-
COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.get_include\(\)\)\;
4+
COMMAND ${Python3_EXECUTABLE} -c import\ numpy\;\ print\(numpy.get_include\(\)\)\;
55
ERROR_VARIABLE NUMPY_INCLUDE_ERROR
66
RESULT_VARIABLE NUMPY_INCLUDE_RETURN
77
OUTPUT_VARIABLE NUMPY_INCLUDE_DIRS
88
OUTPUT_STRIP_TRAILING_WHITESPACE
99
)
1010
execute_process (
11-
COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.__version__\);
11+
COMMAND ${Python3_EXECUTABLE} -c import\ numpy\;\ print\(numpy.__version__\);
1212
ERROR_VARIABLE NUMPY_VERSION_ERROR
1313
RESULT_VARIABLE NUMPY_VERSION_RESULT
1414
OUTPUT_VARIABLE NUMPY_VERSION_STRING
@@ -19,6 +19,6 @@ if (PYTHON_EXECUTABLE)
1919
else (EXISTS ${NUMPY_INCLUDE_DIRS})
2020
SET(NUMPY_FOUND FALSE)
2121
endif (EXISTS ${NUMPY_INCLUDE_DIRS})
22-
else (PYTHON_EXECUTABLE)
22+
else (Python3_EXECUTABLE)
2323
SET(NUMPY_FOUND FALSE)
24-
endif(PYTHON_EXECUTABLE)
24+
endif(Python3_EXECUTABLE)

‎cmake/backends.cmake‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ if(NOT ditched_${name}_${ver})
10951095
COMMAND sed ${dashi} -e "s/X_Y_Z/${sfver}/g" ${dir}/montepython/MPLike_patch_script.py
10961096
BUILD_COMMAND ""
10971097
# Execute the script that fixes the likelihoods
1098-
INSTALL_COMMAND ${PYTHON_EXECUTABLE} ${dir}/montepython/MPLike_patch_script.py
1098+
INSTALL_COMMAND ${Python3_EXECUTABLE} ${dir}/montepython/MPLike_patch_script.py
10991099
)
11001100
endif()
11011101
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -1135,7 +1135,7 @@ if(NOT ditched_${name}_${ver})
11351135
COMMAND sed ${dashi} -e "s/X_Y_Z/${sfver}/g" ${dir}/montepython/MPLike_patch_script.py
11361136
BUILD_COMMAND ""
11371137
# Execute the script that fixes the likelihoods
1138-
INSTALL_COMMAND ${PYTHON_EXECUTABLE} ${dir}/montepython/MPLike_patch_script.py
1138+
INSTALL_COMMAND ${Python3_EXECUTABLE} ${dir}/montepython/MPLike_patch_script.py
11391139
)
11401140
endif()
11411141
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -2082,11 +2082,11 @@ if(NOT ditched_${name}_${ver})
20822082
PATCH_COMMAND tar -C ${dir}/ -xf ${dir}/code/plc_3.0/plc-3.0.tar.bz2 --strip-components=1
20832083
COMMAND patch -p1 < ${patch}/${name}_${ver}.diff
20842084
COMMAND sed ${dashi} -e "s#x86_64#${CMAKE_SYSTEM_PROCESSOR}#g" waf_tools/mbits.py
2085-
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "CC=${CMAKE_C_COMPILER} FC=${CMAKE_Fortran_COMPILER} LDFLAGS=\"${CMAKE_SHARED_LINKER_FLAGS}\" CFLAGS=\"${BACKEND_C_FLAGS}\" ${PYTHON_EXECUTABLE} ${dir}/waf configure --cfitsio_include=${cfitsio_dir}/include --cfitsio_lib=${cfitsio_dir}/lib ${mkl_libs_option} --no_pytools" > run_waf.sh
2085+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "CC=${CMAKE_C_COMPILER} FC=${CMAKE_Fortran_COMPILER} LDFLAGS=\"${CMAKE_SHARED_LINKER_FLAGS}\" CFLAGS=\"${BACKEND_C_FLAGS}\" ${Python3_EXECUTABLE} ${dir}/waf configure --cfitsio_include=${cfitsio_dir}/include --cfitsio_lib=${cfitsio_dir}/lib ${mkl_libs_option} --no_pytools" > run_waf.sh
20862086
COMMAND chmod u+x run_waf.sh
20872087
COMMAND ./run_waf.sh
20882088
BUILD_COMMAND ""
2089-
INSTALL_COMMAND C_INCLUDE_PATH=$(C_INCLUDE_PATH):${PYTHON_INCLUDE_DIR} ${PYTHON_EXECUTABLE} ${dir}/waf install --no_pytools
2089+
INSTALL_COMMAND C_INCLUDE_PATH=$(C_INCLUDE_PATH):${Python3_INCLUDE_DIRS} ${Python3_EXECUTABLE} ${dir}/waf install --no_pytools
20902090
)
20912091
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
20922092
set_as_default_version("backend" ${name} ${ver})
@@ -2218,7 +2218,7 @@ if(NOT ditched_${name}_${ver})
22182218
SOURCE_DIR ${dir}
22192219
BUILD_IN_SOURCE 1
22202220
PATCH_COMMAND patch -p1 < ${patch}
2221-
CONFIGURE_COMMAND ./configure CC=${CMAKE_C_COMPILER} CFLAGS=${Rivet_C_FLAGS} CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=${Rivet_CXX_FLAGS} LDFLAGS=${Rivet_LD_FLAGS} CPPFLAGS=${Rivet_CPP_FLAGS} PYTHON=${PYTHON_EXECUTABLE} --with-yoda=${yoda_dir} --with-hepmc3=${hepmc_dir} -with-fastjet=${fastjet_dir} --prefix=${dir}/local --enable-shared=yes --enable-static=no --libdir=${dir}/local/lib --enable-pyext=${pyext}
2221+
CONFIGURE_COMMAND ./configure CC=${CMAKE_C_COMPILER} CFLAGS=${Rivet_C_FLAGS} CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=${Rivet_CXX_FLAGS} LDFLAGS=${Rivet_LD_FLAGS} CPPFLAGS=${Rivet_CPP_FLAGS} PYTHON=${Python3_EXECUTABLE} --with-yoda=${yoda_dir} --with-hepmc3=${hepmc_dir} -with-fastjet=${fastjet_dir} --prefix=${dir}/local --enable-shared=yes --enable-static=no --libdir=${dir}/local/lib --enable-pyext=${pyext}
22222222
COMMAND ${CMAKE_COMMAND} -E echo "Rivet_dirs=\"${Rivet_dirs}\"" > touch_files.sh
22232223
COMMAND sh -c "cat ${patch_dir}/touch_files.sh" >> touch_files.sh
22242224
COMMAND chmod u+x touch_files.sh
@@ -2330,13 +2330,13 @@ if(NOT ditched_${name}_${ver})
23302330
COMMAND sed ${dashi} -e "s#autosetup.py install#autosetup.py build#g" Makefile
23312331
COMMAND sed ${dashi} -e "s#rm -f libclass.a#rm -rf libclass.a lib#g" Makefile
23322332
COMMAND sed ${dashi} -e "s#\"[.]\"#\"${dir}\"#g" include/common.h
2333-
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${PYTHON_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
2333+
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${Python3_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
23342334
COMMAND ${CMAKE_COMMAND} -E make_directory lib
23352335
COMMAND find python/ -name "classy*.so" | xargs -I {} cp "{}" lib/
23362336
COMMAND ${CMAKE_COMMAND} -E echo "#This is a trampoline script to import the cythonized python module under a different name" > lib/${lib}_${sfver}.py
23372337
COMMAND ${CMAKE_COMMAND} -E echo "from ${lib} import *" >> lib/${lib}_${sfver}.py
23382338
INSTALL_COMMAND ""
2339-
COMMAND ${PYTHON_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
2339+
COMMAND ${Python3_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
23402340
)
23412341
endif()
23422342
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -2369,13 +2369,13 @@ if(NOT ditched_${name}_${ver})
23692369
COMMAND sed ${dashi} -e "s#autosetup.py install#autosetup.py build#g" Makefile
23702370
COMMAND sed ${dashi} -e "s#rm -f libclass.a#rm -rf libclass.a lib#g" Makefile
23712371
COMMAND sed ${dashi} -e "s#\"[.]\"#\"${dir}\"#g" include/common.h
2372-
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${PYTHON_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
2372+
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${Python3_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
23732373
COMMAND ${CMAKE_COMMAND} -E make_directory lib
23742374
COMMAND find python/ -name "classy*.so" | xargs -I {} cp "{}" lib/
23752375
COMMAND ${CMAKE_COMMAND} -E echo "#This is a trampoline script to import the cythonized python module under a different name" > lib/${lib}_${sfver}.py
23762376
COMMAND ${CMAKE_COMMAND} -E echo "from ${lib} import *" >> lib/${lib}_${sfver}.py
23772377
INSTALL_COMMAND ""
2378-
COMMAND ${PYTHON_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
2378+
COMMAND ${Python3_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
23792379
)
23802380
endif()
23812381
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -2408,13 +2408,13 @@ if(NOT ditched_${name}_${ver})
24082408
COMMAND sed ${dashi} -e "s#autosetup.py install#autosetup.py build#g" Makefile
24092409
COMMAND sed ${dashi} -e "s#rm -f libclass.a#rm -rf libclass.a lib#g" Makefile
24102410
COMMAND sed ${dashi} -e "s#\"[.]\"#\"${dir}\"#g" include/common.h
2411-
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${PYTHON_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
2411+
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${Python3_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
24122412
COMMAND ${CMAKE_COMMAND} -E make_directory lib
24132413
COMMAND find python/ -name "classy*.so" | xargs -I {} cp "{}" lib/
24142414
COMMAND ${CMAKE_COMMAND} -E echo "#This is a trampoline script to import the cythonized python module under a different name" > lib/${lib}_${sfver}.py
24152415
COMMAND ${CMAKE_COMMAND} -E echo "from ${lib} import *" >> lib/${lib}_${sfver}.py
24162416
INSTALL_COMMAND ""
2417-
COMMAND ${PYTHON_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
2417+
COMMAND ${Python3_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
24182418
)
24192419
endif()
24202420
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -2447,13 +2447,13 @@ if(NOT ditched_${name}_${ver})
24472447
COMMAND sed ${dashi} -e "s#autosetup.py install#autosetup.py build#g" Makefile
24482448
COMMAND sed ${dashi} -e "s#rm -f libclass.a#rm -rf libclass.a lib#g" Makefile
24492449
COMMAND sed ${dashi} -e "s#\"[.]\"#\"${dir}\"#g" include/common.h
2450-
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${PYTHON_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
2450+
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${Python3_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
24512451
COMMAND ${CMAKE_COMMAND} -E make_directory lib
24522452
COMMAND find python/ -name "classy*.so" | xargs -I {} cp "{}" lib/
24532453
COMMAND ${CMAKE_COMMAND} -E echo "#This is a trampoline script to import the cythonized python module under a different name" > lib/${lib}_${sfver}.py
24542454
COMMAND ${CMAKE_COMMAND} -E echo "from ${lib} import *" >> lib/${lib}_${sfver}.py
24552455
INSTALL_COMMAND ""
2456-
COMMAND ${PYTHON_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
2456+
COMMAND ${Python3_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
24572457
)
24582458
endif()
24592459
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)
@@ -2487,13 +2487,13 @@ if(NOT ditched_${name}_${ver})
24872487
COMMAND sed ${dashi} -e "s#autosetup.py install#autosetup.py build#g" Makefile
24882488
COMMAND sed ${dashi} -e "s#rm -f libclass.a#rm -rf libclass.a lib#g" Makefile
24892489
COMMAND sed ${dashi} -e "s#\"[.]\"#\"${dir}\"#g" include/common.h
2490-
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${PYTHON_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
2490+
BUILD_COMMAND ${MAKE_PARALLEL} CC=${CMAKE_C_COMPILER} OMPFLAG=${CLASSY_OpenMP_C_FLAGS} OPTFLAG= CCFLAG=${BACKEND_C_FLAGS} LDFLAG=${CLASSY_LINKER_FLAGS} PYTHON=${Python3_EXECUTABLE} ${CYTHON_LINK} CFLAGS=${BACKEND_C_FLAGS} all
24912491
COMMAND ${CMAKE_COMMAND} -E make_directory lib
24922492
COMMAND find python/ -name "classy*.so" | xargs -I {} cp "{}" lib/
24932493
COMMAND ${CMAKE_COMMAND} -E echo "#This is a trampoline script to import the cythonized python module under a different name" > lib/${lib}_${sfver}.py
24942494
COMMAND ${CMAKE_COMMAND} -E echo "from ${lib} import *" >> lib/${lib}_${sfver}.py
24952495
INSTALL_COMMAND ""
2496-
COMMAND ${PYTHON_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
2496+
COMMAND ${Python3_EXECUTABLE} ${patch}/../create_SDSSDR7_fid.py ${dir} ${sfver}
24972497
)
24982498
endif()
24992499
add_extra_targets("backend" ${name} ${ver} ${dir} ${dl} clean)

‎cmake/contrib.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ if(NOT EXCLUDE_YODA)
291291
DOWNLOAD_COMMAND ${DL_CONTRIB} ${dl} ${md5} ${dir} ${name} ${ver}
292292
SOURCE_DIR ${dir}
293293
BUILD_IN_SOURCE 1
294-
CONFIGURE_COMMAND ${YODA_PATH}/configure CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=${YODA_CXX_FLAGS} LDFLAGS=${YODA_CONFIG_LDFLAGS} PYTHON=${PYTHON_EXECUTABLE} --prefix=${dir}/local --enable-static --enable-pyext=${pyext}
294+
CONFIGURE_COMMAND ${YODA_PATH}/configure CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=${YODA_CXX_FLAGS} LDFLAGS=${YODA_CONFIG_LDFLAGS} PYTHON=${Python3_EXECUTABLE} --prefix=${dir}/local --enable-static --enable-pyext=${pyext}
295295
BUILD_COMMAND ${MAKE_PARALLEL} CXX="${CMAKE_CXX_COMPILER}"
296296
INSTALL_COMMAND ${MAKE_INSTALL_PARALLEL}
297297
)

‎cmake/externals.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function(check_ditch_status name version dir)
196196
endif()
197197
endforeach()
198198
foreach(ditch_command ${itch})
199-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "print(\"${name}_${version}\".lower().startswith(\"${ditch_command}\".lower()))"
199+
execute_process(COMMAND ${Python3_EXECUTABLE} -c "print(\"${name}_${version}\".lower().startswith(\"${ditch_command}\".lower()))"
200200
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
201201
RESULT_VARIABLE result
202202
OUTPUT_VARIABLE output)

‎cmake/optional.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ endif()
407407
# Check for Cython
408408
set(FPHSA_NAME_MISMATCHED TRUE)
409409
find_package(Cython)
410-
if(CYTHON_FOUND OR CYTHON${PYTHON_VERSION_STRING}_FOUND)
410+
if(CYTHON_FOUND OR CYTHON${Python3_VERSION}_FOUND)
411411
include_directories(${CYTHON_INCLUDE_DIRS})
412412
message("-- Found Cython libraries: ${CYTHON_EXECUTABLE}")
413413
endif()

‎cmake/utilities.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,13 +640,13 @@ endfunction()
640640

641641
# Simple function to find specific Python modules
642642
macro(gambit_find_python_module module)
643-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import ${module}" RESULT_VARIABLE return_value ERROR_QUIET)
643+
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import ${module}" RESULT_VARIABLE return_value ERROR_QUIET)
644644
if (NOT return_value)
645645
message(STATUS "Found Python module ${module}.")
646646
set(PY_${module}_FOUND TRUE)
647647
# If module is h5py and hdf5 is present, make sure they are built with the same version
648648
if(HDF5_FOUND AND module STREQUAL "h5py")
649-
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import h5py; import re; print(re.search(\"HDF5[ ]+(.*)\",h5py.version.info).group(1))" OUTPUT_VARIABLE hdf5_ver RESULT_VARIABLE hdf5_res ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
649+
execute_process(COMMAND ${Python3_EXECUTABLE} -c "import h5py; import re; print(re.search(\"HDF5[ ]+(.*)\",h5py.version.info).group(1))" OUTPUT_VARIABLE hdf5_ver RESULT_VARIABLE hdf5_res ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
650650
if(${hdf5_res})
651651
message(FATAL_ERROR "-- Module h5py is corrupted")
652652
elseif(NOT ${hdf5_ver} AND NOT ${hdf5_ver} STREQUAL ${HDF5_VERSION})

0 commit comments

Comments
 (0)