Release 0.1.1 (#8)

- Update llvmlite ce7b659c6a62aa4466d6b3894573f9900f8a1451
- Update numba e86d15701de24f66b1da3fd9015208d25ea26d81
- Cleanup build workflow and the pi example code
- Ensure gitlab trigger phrase is in brackets
- Use directly conda build instead of 3rd party action

Author: ggeorgakoudis

.github/workflows/build-upload-conda-base.yml

@@ -59,14 +59,13 @@ jobs:
           auto-activate-base: false
           show-channel-urls: true
       - name: Build and upload llvm-openmp-dev
-        uses: uibcdf/[email protected]
-        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;
 
   # Job to deploy llvmlite and numba, matrixed on os and python version.
   conda-deploy-llvmlite:
@@ -92,14 +91,13 @@ jobs:
           auto-activate-base: false
           show-channel-urls: true
       - name: Build and upload llvmlite
-        uses: uibcdf/[email protected]
-        with:
-          meta_yaml_dir: buildscripts/conda-recipes/llvmlite
-          python-version: ${{ matrix.python-version }}
-          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 \
+            --python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
+            buildscripts/conda-recipes/llvmlite;
 
   # Job to deploy numba, matrixed on os and python version.
   conda-deploy-numba:
@@ -125,14 +123,13 @@ jobs:
           auto-activate-base: false
           show-channel-urls: true
       - name: Build and upload numba
-        uses: uibcdf/[email protected]
-        with:
-          meta_yaml_dir: buildscripts/conda-recipes/numba
-          python-version: ${{ matrix.python-version }}
-          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 \
+            --python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
+            buildscripts/conda-recipes/numba;
 
   # Job to deploy the pyomp metapackage, runs once as it is independent of the
   # python version.
@@ -152,20 +149,19 @@ jobs:
       - name: Create and activate conda env
         uses: conda-incubator/setup-miniconda@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.10"
           environment-file: ${{ inputs.env }}
           auto-update-conda: false
           auto-activate-base: false
           show-channel-urls: true
       - name: Build and upload pyomp
-        uses: uibcdf/[email protected]
-        with:
-          meta_yaml_dir: buildscripts/conda-recipes/pyomp
-          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/pyomp;
 
   ################################################################
   # Deploy on ARM64 using QEMU and a docker container for building.

.gitlab-ci.yml

@@ -86,7 +86,7 @@ stages:
     forward:
       pipeline_variables: true
   rules:
-    - if: ($CI_COMMIT_MESSAGE =~ /run gitlab ci/ || $CI_COMMIT_TAG)
+    - if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
 
 include:
   # Sets ID tokens for every job using `default:`

.gitlab/subscribed-pipelines.yml

@@ -24,7 +24,7 @@
         exit 1
       fi
   rules:
-    - if: ($CI_COMMIT_MESSAGE =~ /run gitlab ci/ || $CI_COMMIT_TAG)
+    - if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
 
 ###
 # Trigger a build-and-test pipeline for a machine.

README.md

@@ -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
@@ -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

buildscripts/conda-recipes/llvmlite/meta.yaml

@@ -4,7 +4,7 @@ package:
 
 source:
   git_url: https://github.com/Python-for-HPC/llvmliteWithOpenmp.git
-  git_rev: develop
+  git_rev: ce7b659c6a62aa4466d6b3894573f9900f8a1451
   git_depth: 1
 
 build:

buildscripts/conda-recipes/numba/meta.yaml

@@ -7,7 +7,7 @@ package:
 
 source:
   git_url: https://github.com/Python-for-HPC/numbaWithOpenmp.git
-  git_rev: develop
+  git_rev: e86d15701de24f66b1da3fd9015208d25ea26d81
   git_depth: 1
 
 build:

buildscripts/conda-recipes/pyomp/meta.yaml

@@ -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] }}

examples/pi_loop.py

@@ -9,7 +9,6 @@ def calc_pi():
     the_sum = 0.0
     with openmp("parallel for reduction(+:the_sum) schedule(static)"):
         for j in range(num_steps):
-            c = step
             x = ((j-1) - 0.5) * step
             the_sum += 4.0 / (1.0 + x * x)