Skip to content

Commit 913fc78

Browse files
ggeorgakoudisggeorgakoudis
committed
Release 0.1.1
- 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 [run gitlab ci]
1 parent 2b07f04 commit 913fc78

File tree

8 files changed

+36
-41
lines changed

8 files changed

+36
-41
lines changed

Diff for: ‎.github/workflows/build-upload-conda-base.yml

+29-33
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ jobs:
5959
auto-activate-base: false
6060
show-channel-urls: true
6161
- name: Build and upload llvm-openmp-dev
62-
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
63-
with:
64-
meta_yaml_dir: buildscripts/conda-recipes/llvm-openmp-dev
65-
python-version: "3.10"
66-
user: python-for-hpc
67-
label: ${{ inputs.label }}
68-
overwrite: true
69-
token: ${{ secrets.ANACONDA_TOKEN }}
62+
run: |
63+
conda install -y -c conda-forge conda-build conda-verify anaconda-client;
64+
conda config --set anaconda_upload yes;
65+
conda build --user python-for-hpc --label ${{ inputs.label }} \
66+
-c python-for-hpc -c conda-forge \
67+
--token ${{ secrets.ANACONDA_TOKEN }} \
68+
buildscripts/conda-recipes/llvm-openmp-dev;
7069
7170
# Job to deploy llvmlite and numba, matrixed on os and python version.
7271
conda-deploy-llvmlite:
@@ -92,14 +91,13 @@ jobs:
9291
auto-activate-base: false
9392
show-channel-urls: true
9493
- name: Build and upload llvmlite
95-
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
96-
with:
97-
meta_yaml_dir: buildscripts/conda-recipes/llvmlite
98-
python-version: ${{ matrix.python-version }}
99-
user: python-for-hpc
100-
label: ${{ inputs.label }}
101-
overwrite: true
102-
token: ${{ secrets.ANACONDA_TOKEN }}
94+
run: |
95+
conda install -y -c conda-forge conda-build conda-verify anaconda-client;
96+
conda config --set anaconda_upload yes;
97+
conda build --user python-for-hpc --label ${{ inputs.label }} \
98+
-c python-for-hpc -c conda-forge \
99+
--python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
100+
buildscripts/conda-recipes/llvmlite;
103101
104102
# Job to deploy numba, matrixed on os and python version.
105103
conda-deploy-numba:
@@ -125,14 +123,13 @@ jobs:
125123
auto-activate-base: false
126124
show-channel-urls: true
127125
- name: Build and upload numba
128-
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
129-
with:
130-
meta_yaml_dir: buildscripts/conda-recipes/numba
131-
python-version: ${{ matrix.python-version }}
132-
user: python-for-hpc
133-
label: ${{ inputs.label }}
134-
overwrite: true
135-
token: ${{ secrets.ANACONDA_TOKEN }}
126+
run: |
127+
conda install -y -c conda-forge conda-build conda-verify anaconda-client;
128+
conda config --set anaconda_upload yes;
129+
conda build --user python-for-hpc --label ${{ inputs.label }} \
130+
-c python-for-hpc -c conda-forge \
131+
--python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
132+
buildscripts/conda-recipes/numba;
136133
137134
# Job to deploy the pyomp metapackage, runs once as it is independent of the
138135
# python version.
@@ -152,20 +149,19 @@ jobs:
152149
- name: Create and activate conda env
153150
uses: conda-incubator/setup-miniconda@v3
154151
with:
155-
python-version: ${{ matrix.python-version }}
152+
python-version: "3.10"
156153
environment-file: ${{ inputs.env }}
157154
auto-update-conda: false
158155
auto-activate-base: false
159156
show-channel-urls: true
160157
- name: Build and upload pyomp
161-
uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0
162-
with:
163-
meta_yaml_dir: buildscripts/conda-recipes/pyomp
164-
python-version: "3.10"
165-
user: python-for-hpc
166-
label: ${{ inputs.label }}
167-
overwrite: true
168-
token: ${{ secrets.ANACONDA_TOKEN }}
158+
run: |
159+
conda install -y -c conda-forge conda-build conda-verify anaconda-client;
160+
conda config --set anaconda_upload yes;
161+
conda build --user python-for-hpc --label ${{ inputs.label }} \
162+
-c python-for-hpc -c conda-forge \
163+
--token ${{ secrets.ANACONDA_TOKEN }} \
164+
buildscripts/conda-recipes/pyomp;
169165
170166
################################################################
171167
# Deploy on ARM64 using QEMU and a docker container for building.

Diff for: ‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ stages:
8686
forward:
8787
pipeline_variables: true
8888
rules:
89-
- if: ($CI_COMMIT_MESSAGE =~ /run gitlab ci/ || $CI_COMMIT_TAG)
89+
- if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
9090

9191
include:
9292
# Sets ID tokens for every job using `default:`

Diff for: ‎.gitlab/subscribed-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
exit 1
2525
fi
2626
rules:
27-
- if: ($CI_COMMIT_MESSAGE =~ /run gitlab ci/ || $CI_COMMIT_TAG)
27+
- if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
2828

2929
###
3030
# Trigger a build-and-test pipeline for a machine.

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ and the past few NumPy versions and various operating systems and architectures,
1212
there is quite an extensive build infrastructure required to get all these
1313
combinations and recently we have sorted out some of these combinations.
1414
The architecture and operating system combinations that currently work are:
15-
linux-64 (x86_64), osx-arm64 (mac), and linux-ppc64le.
15+
linux-64 (x86_64), osx-arm64 (mac), linux-arm64, and linux-ppc64le.
1616
These distributions are available with the `conda` command in the next section.
1717

1818
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
2424

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

2929
```bash
3030
conda install -c python-for-hpc -c conda-forge --override-channels pyomp

Diff for: ‎buildscripts/conda-recipes/llvmlite/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package:
44

55
source:
66
git_url: https://github.com/Python-for-HPC/llvmliteWithOpenmp.git
7-
git_rev: develop
7+
git_rev: ce7b659c6a62aa4466d6b3894573f9900f8a1451
88
git_depth: 1
99

1010
build:

Diff for: ‎buildscripts/conda-recipes/numba/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package:
77

88
source:
99
git_url: https://github.com/Python-for-HPC/numbaWithOpenmp.git
10-
git_rev: develop
10+
git_rev: e86d15701de24f66b1da3fd9015208d25ea26d81
1111
git_depth: 1
1212

1313
build:

Diff for: ‎buildscripts/conda-recipes/pyomp/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: pyomp
3-
version: 0.1
3+
version: 0.1.1
44

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

Diff for: ‎examples/pi_loop.py

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ def calc_pi():
99
the_sum = 0.0
1010
with openmp("parallel for reduction(+:the_sum) schedule(static)"):
1111
for j in range(num_steps):
12-
c = step
1312
x = ((j-1) - 0.5) * step
1413
the_sum += 4.0 / (1.0 + x * x)
1514

0 commit comments

Comments
 (0)