Skip to content

Commit

Permalink
pocl workaround for MacOS (#169)
Browse files Browse the repository at this point in the history
* pocl fix for MacOS

* bump CI

* Update tests.yaml

* Update install.sh

* Update tests.yaml

* Update tests.yaml
  • Loading branch information
matthiasdiener authored Mar 24, 2024
1 parent fb6917e commit 16411d3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/makezip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build modules.zip
run: |
[[ $(uname) == Linux ]] && sudo apt-get update && sudo apt-get install -y openmpi-bin libopenmpi-dev
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ShellCheck
run: |
shellcheck -x $(find -name '*.sh')
Expand All @@ -27,7 +27,7 @@ jobs:
os: [ubuntu-latest, macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install prerequisites
run: |
[[ $(uname) == Linux ]] && sudo apt-get update && sudo apt-get install -y openmpi-bin libopenmpi-dev libgl1-mesa-glx libegl1
Expand All @@ -41,18 +41,20 @@ jobs:
# Don't build pyopencl as that is difficult
cat myreq.txt | sed /pyopencl/d > req.txt
pip install -r req.txt
- name: Run update
run: |
./pull-packages.sh -x
# FIXME: disabled until https://github.com/conda-forge/pocl-feedstock/pull/96 is resolved
# - name: Run update
# run: |
# ./pull-packages.sh -x
- name: Reinstall emirge env with new requirements.txt
run: |
source miniforge3/bin/activate ceesd
conda clean -a
conda deactivate
./install.sh --env-name=reinstall_env --pip-pkgs=req.txt
- name: Reinstall conda env with new env file
run: |
./install.sh --conda-env=myenv.yml --pip-pkgs=req.txt
# FIXME: Disabled until the next mpi4py release (v4)
# - name: Reinstall conda env with new env file
# run: |
# ./install.sh --conda-env=myenv.yml --pip-pkgs=req.txt
- name: Run examples
run: |
source miniforge3/bin/activate ceesd
Expand Down
7 changes: 7 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ if [[ $(uname) == "Darwin" ]]; then
[[ $(uname -m) == "arm64" ]] && conda install --yes clang_osx-arm64
fi

# FIXME: workaround until we address
# https://github.com/conda-forge/pocl-feedstock/pull/96
if [[ $(uname) == "Darwin" ]]; then
if conda list | grep -q ld64; then
conda install --yes ld64=609
fi
fi

# Install an environment activation script
rm -rf "$mcprefix"/config
Expand Down

0 comments on commit 16411d3

Please sign in to comment.