Skip to content

Commit

Permalink
Update pyomp version, test conda build directly, update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
ggeorgakoudis committed Oct 4, 2024
1 parent 25a091e commit 582e194
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/build-upload-conda-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,21 @@ jobs:
auto-activate-base: false
show-channel-urls: true
- name: Build and upload llvm-openmp-dev
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
with:
meta_yaml_dir: buildscripts/conda-recipes/llvm-openmp-dev
python-version: "3.10"
user: python-for-hpc
label: ${{ inputs.label }}
overwrite: true
token: ${{ secrets.ANACONDA_TOKEN }}
run: |
conda install -y -c conda-forge conda-build conda-verify anaconda-client;
conda config --set anaconda_upload yes;
conda build --user python-for-hpc --label ${{ inputs.label }} \
-c python-for-hpc -c conda-forge \
--token ${{ secrets.ANACONDA_TOKEN }} \
buildscripts/conda-recipes/llvm-openmp-dev;
#uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
#with:
# meta_yaml_dir: buildscripts/conda-recipes/llvm-openmp-dev
# python-version: "3.10"
# user: python-for-hpc
# label: ${{ inputs.label }}
# overwrite: true
# token: ${{ secrets.ANACONDA_TOKEN }}

# Job to deploy llvmlite and numba, matrixed on os and python version.
conda-deploy-llvmlite:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ and the past few NumPy versions and various operating systems and architectures,
there is quite an extensive build infrastructure required to get all these
combinations and recently we have sorted out some of these combinations.
The architecture and operating system combinations that currently work are:
linux-64 (x86_64), osx-arm64 (mac), and linux-ppc64le.
linux-64 (x86_64), osx-arm64 (mac), linux-arm64, and linux-ppc64le.
These distributions are available with the `conda` command in the next section.

Due to PyOMP using the LLVM OpenMP infrastructure, we also inherit its
Expand All @@ -24,7 +24,7 @@ In the future, we plan on converting PyOMP to a Numba extension which should eli

### Conda
PyOMP is distributed as a package through Conda, currently supporting linux-64
(x86_64), osx-arm64 (mac), and linux-ppc64le architectures.
(x86_64), osx-arm64 (mac), linux-arm64, and linux-ppc64le architectures.

```bash
conda install -c python-for-hpc -c conda-forge --override-channels pyomp
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/conda-recipes/pyomp/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: pyomp
version: 0.1
version: 0.1.1

build:
string: {{ (GITHUB_HEAD_SHA | default(''))[:7] ~ (CI_COMMIT_SHA | default(''))[:7] }}
Expand Down

0 comments on commit 582e194

Please sign in to comment.