Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure right Python version is used in DP3, WSClean and dependencies by specifying -DPython3_EXECUTABLE CMake option #19119

Merged
merged 2 commits into from
Oct 31, 2023
Merged

ensure right Python version is used in DP3, WSClean and dependencies by specifying -DPython3_EXECUTABLE CMake option #19119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ee666
Ensure right Python version is used in DP3, WSClean and dependencies
Oct 31, 2023
d7da953
Improve comment by being more explicit
Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions easybuild/easyconfigs/a/AOFlagger/AOFlagger-3.4.0-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ dependencies = [
('libxml2', '2.9.13'),
]

# Without this, the wrong (system) python is picked up by cmake
# in cases where the system python is newer than the one used in these EasyConfigs
# See PR # 19119
configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '

sanity_check_paths = {
'files': ['include/aoflagger.h', 'bin/aoflagger'],
'dirs': ['bin'],
Expand Down
6 changes: 5 additions & 1 deletion easybuild/easyconfigs/c/casacore/casacore-3.5.0-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ dependencies = [
]

configopts = '-DBUILD_PYTHON=NO -DBUILD_PYTHON3=YES -Wno-dev -DCXX11="ON" -DDATA_DIR=%(installdir)s/data '
configopts += '-DUSE_OPENMP=ON -DUSE_HDF5=ON -DUSE_MPI=ON'
configopts += '-DUSE_OPENMP=ON -DUSE_HDF5=ON -DUSE_MPI=ON '
# Without this, the wrong (system) python is picked up by cmake
# in cases where the system python is newer than the one used in these EasyConfigs
# See PR # 19119
configopts += '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '

sanity_check_paths = {
'files': ['lib/libcasa_casa.%s' % SHLIB_EXT, 'lib/libcasa_mirlib.%s' % SHLIB_EXT,
Expand Down
5 changes: 5 additions & 0 deletions easybuild/easyconfigs/d/DP3/DP3-6.0-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ dependencies = [
('AOFlagger', '3.4.0')
]

# Without this, the wrong (system) python is picked up by cmake
# in cases where the system python is newer than the one used in these EasyConfigs
# See PR # 19119
configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '

sanity_check_paths = {
'files': ['include/include/dp3/base/DP3.h', 'bin/DP3'],
'dirs': ['bin'],
Expand Down
5 changes: 5 additions & 0 deletions easybuild/easyconfigs/e/EveryBeam/EveryBeam-0.5.2-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ dependencies = [
('libxml2', '2.9.13'),
]

# Without this, the wrong (system) python is picked up by cmake
# in cases where the system python is newer than the one used in these EasyConfigs
# See PR # 19119
configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '

sanity_check_paths = {
'files': ['include/EveryBeam/beamformer.h', 'lib/libeverybeam.so'],
'dirs': [],
Expand Down
5 changes: 5 additions & 0 deletions easybuild/easyconfigs/w/WSClean/WSClean-3.4-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ dependencies = [
('Python', '3.10.4'),
]

# Without this, the wrong (system) python is picked up by cmake
# in cases where the system python is newer than the one used in these EasyConfigs
# See PR # 19119
configopts = '-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '

sanity_check_paths = {
'files': ['include/wscleaninterface.h', 'bin/wsclean'],
'dirs': ['bin'],
Expand Down