tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid legacy compilation failures on recent ubuntu machines that only have python3-config

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-08-12 12:41:44 -04:00
parent e87bad43f9
commit e0ca512f50
8 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/python/Makefile.lammps
View File

@ -1,7 +1,14 @@
# Settings that the LAMMPS build will import when this package library is used # Settings that the LAMMPS build will import when this package library is used
# See the README file for more explanation # See the README file for more explanation
ifeq ($(shell type python3 >/dev/null 2>&1; echo $$?), 0)
python_SYSINC = $(shell which python-config > /dev/null 2>&1 && python-config --includes || :) PYTHON=python3
python_SYSLIB = $(shell which python-config > /dev/null 2>&1 && python-config --ldflags --embed > /dev/null 2>&1 && python-config --ldflags --embed || (which python-config > /dev/null 2>&1 && python-config --ldflags || :) ) PYTHONCONFIG = python3-config
python_SYSPATH = else
PYTHONCONFIG = python-config
PYTHON=python PYTHON=python
endif
python_SYSINC = $(shell which $(PYTHONCONFIG) > /dev/null 2>&1 && $(PYTHONCONFIG) --includes || :)
python_SYSLIB = $(shell which $(PYTHONCONFIG) > /dev/null 2>&1 && $(PYTHONCONFIG) --ldflags --embed > /dev/null 2>&1 && $(PYTHONCONFIG) --ldflags --embed || (which $(PYTHONCONFIG) > /dev/null 2>&1 && $(PYTHONCONFIG) --ldflags || :) )
python_SYSPATH =

1
tools/singularity/ubuntu20.04.def
View File

@ -54,6 +54,7 @@ From: ubuntu:20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
texlive \ texlive \

1
tools/singularity/ubuntu20.04_amd_rocm.def
View File

@ -83,6 +83,7 @@ From: ubuntu:20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
vim-nox \ vim-nox \

1
tools/singularity/ubuntu20.04_gpu.def
View File

@ -88,6 +88,7 @@ From: ubuntu:20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
vim-nox \ vim-nox \

1
tools/singularity/ubuntu20.04_intel_opencl.def
View File

@ -53,6 +53,7 @@ From: ubuntu:20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
vim-nox \ vim-nox \

1
tools/singularity/ubuntu20.04_nvidia.def
View File

@ -56,6 +56,7 @@ From: nvidia/cuda:11.6.2-devel-ubuntu20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
vim-nox \ vim-nox \

1
tools/singularity/ubuntu20.04_oneapi.def
View File

@ -52,6 +52,7 @@ From: ubuntu:20.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
texlive \ texlive \

1
tools/singularity/ubuntu22.04.def
View File

@ -54,6 +54,7 @@ From: ubuntu:22.04
python3-setuptools \ python3-setuptools \
python3-virtualenv \ python3-virtualenv \
python3-venv \ python3-venv \
python-is-python3 \
rsync \ rsync \
ssh \ ssh \
texlive \ texlive \