Skip to content

Commit

Permalink
Investigate GHA failure
Browse files Browse the repository at this point in the history
  • Loading branch information
jacquev6 committed Jun 12, 2024
1 parent 1703d04 commit 6879f5c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build-topics-test-gha-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@ jobs:
- make-source-dist
strategy:
matrix:
python_version: ['3.8', '3.12']
python_version: ['3.8']
steps:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_version }}
- name: Install Python packages
run: pip${{ matrix.python_version }} install auditwheel build Chrones pybind11 twine
- run: python${{ matrix.python_version }} -m pybind11 --help
- run: python${{ matrix.python_version }} -m pybind11 --includes
- name: Install CUDA
run: |
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
Expand Down Expand Up @@ -108,7 +110,7 @@ jobs:
- build-for-linux
strategy:
matrix:
python_version: ['3.8', '3.12']
python_version: ['3.8']
steps:
- name: Install Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -195,7 +197,7 @@ jobs:
- build-for-windows
strategy:
matrix:
python_version: ['3.8', '3.12']
python_version: ['3.8']
env:
MACOSX_DEPLOYMENT_TARGET: 11.0
steps:
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ def make_liblincs_extension():
print("WARNING: 'chrones' was not found, lincs will be compiled without Chrones", file=sys.stderr)

try:
include_dirs += [
option[2:]
for option in subprocess.run(
[sys.executable, "-m", "pybind11", "--includes"], capture_output=True, universal_newlines=True, check=True,
).stdout.strip().split(" ")
]
pybind1_command = [f"python{sys.version_info.major}.{sys.version_info.minor}", "-m", "pybind11", "--includes"]
pybind1_process = subprocess.run(pybind1_command, capture_output=True, universal_newlines=True, check=True)
except subprocess.CalledProcessError:
print("WARNING: 'pybind11' was not found, compilation will fail", file=sys.stderr)
print(pybind1_command, file=sys.stderr)
subprocess.run(pybind1_command)
else:
include_dirs += [option[2:] for option in pybind1_process.stdout.strip().split(" ")]

if sys.platform == "linux":
extra_compile_args["c++"] = ["-std=c++17", "-Werror=switch", "-fopenmp"]
Expand Down

0 comments on commit 6879f5c

Please sign in to comment.