Skip to content

Commit 528c1ae

Browse files
authored
Release v0.8.0 (#730)
Merge develop to master for release [ committed by @MattToast ] [ reviewed by @al-rigazzi ]
2 parents 5039699 + 0bab07c commit 528c1ae

File tree

116 files changed

+6239
-2806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+6239
-2806
lines changed

.github/workflows/release.yml

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -32,108 +32,61 @@ on:
3232
release:
3333
types: [published]
3434

35-
36-
env:
37-
HOMEBREW_NO_ANALYTICS: "ON" # Make Homebrew installation a little quicker
38-
HOMEBREW_NO_AUTO_UPDATE: "ON"
39-
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: "ON"
40-
HOMEBREW_NO_GITHUB_API: "ON"
41-
HOMEBREW_NO_INSTALL_CLEANUP: "ON"
42-
CIBW_SKIP: "pp* *i686*" # skip building for PyPy
43-
CIBW_ARCHS_MACOS: x86_64
44-
CIBW_ARCHS_LINUX: x86_64 # ppc64le # uncomment to enable powerPC build
45-
CIBW_ENVIRONMENT_MACOS: PATH="$(brew --prefix)/opt/make/libexec/gnubin:$PATH"
46-
MACOSX_DEPLOYMENT_TARGET: "10.09"
47-
48-
4935
jobs:
50-
build_wheels:
51-
name: Build wheels on ${{ matrix.os }}
52-
runs-on: ${{ matrix.os }}
53-
strategy:
54-
fail-fast: false
55-
matrix:
56-
os: [ubuntu-22.04, macos-12]
57-
36+
build_dists:
37+
name: Build Distributions
38+
runs-on: ubuntu-22.04
5839
steps:
5940
- uses: actions/checkout@v4
6041
- uses: actions/setup-python@v5
42+
with:
43+
python-version: '3.9'
6144

62-
- name: Install cibuildwheel
63-
run: python -m pip install cibuildwheel>=2.12.3
45+
- name: Install build
46+
run: python -m pip install 'build>=1.2.2,<2'
6447

6548
- name: Install build-essentials
66-
if: contains(matrix.os, 'ubuntu')
6749
run: |
6850
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
6951
sudo apt-get update
70-
sudo apt-get install -y build-essential
71-
sudo apt-get install -y wget
52+
sudo apt-get install -y build-essential wget
7253
73-
- name: Install GNU make for MacOS
74-
if: contains(matrix.os, 'macos')
75-
run: brew install make || true
54+
- name: Build Distributions
55+
run: python -m build .
7656

77-
- name: list target wheels
78-
run: |
79-
python -m cibuildwheel . --print-build-identifiers
80-
81-
- name: Build wheels
82-
run: python -m cibuildwheel --output-dir wheelhouse
83-
env:
84-
CIBW_ENVIRONMENT_MACOS: PATH="$(brew --prefix)/opt/make/libexec/gnubin:$PATH"
85-
MACOSX_DEPLOYMENT_TARGET: "10.09"
86-
87-
- uses: actions/upload-artifact@v2
57+
- uses: actions/upload-artifact@v3
8858
with:
89-
path: ./wheelhouse/*.whl
90-
91-
92-
build_sdist:
93-
name: Build source distribution
94-
runs-on: ubuntu-latest
95-
steps:
96-
- uses: actions/checkout@v4
97-
98-
- uses: actions/setup-python@v5
99-
name: Install Python
100-
with:
101-
python-version: '3.9'
102-
103-
- name: Build sdist
104-
run: |
105-
python -m pip install cmake>=3.13
106-
python setup.py sdist
107-
108-
- uses: actions/upload-artifact@v2
109-
with:
110-
path: dist/*.tar.gz
59+
name: distributables
60+
path: ./dist/*
11161

11262

11363
upload_pypi:
114-
needs: [build_wheels, build_sdist]
115-
runs-on: ubuntu-latest
64+
needs: [build_dists]
65+
runs-on: ubuntu-22.04
11666
steps:
117-
- uses: actions/download-artifact@v2
67+
- uses: actions/download-artifact@v3
11868
with:
119-
name: artifact
69+
name: distributables
12070
path: dist
12171

12272
- uses: pypa/gh-action-pypi-publish@release/v1
12373
with:
12474
user: __token__
12575
password: ${{ secrets.PYPI }}
126-
#repository_url: https://test.pypi.org/legacy/
127-
76+
# repository-url: https://test.pypi.org/legacy/
12877

12978
createPullRequest:
130-
runs-on: ubuntu-latest
79+
needs: [upload_pypi]
80+
runs-on: ubuntu-22.04
13181
steps:
13282
- name: Checkout code
13383
uses: actions/checkout@v4
13484

13585
- name: Create pull request
13686
run: |
137-
gh pr create -B develop -H master --title 'Merge master into develop' --body 'This PR brings develop up to date with master for release.'
87+
gh pr create -B develop \
88+
-H master \
89+
--title 'Merge master into develop' \
90+
--body 'This PR brings develop up to date with master for release.'
13891
env:
13992
GH_TOKEN: ${{ github.token }}

.github/workflows/run_tests.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ env:
4545
HOMEBREW_NO_GITHUB_API: "ON"
4646
HOMEBREW_NO_INSTALL_CLEANUP: "ON"
4747
DEBIAN_FRONTEND: "noninteractive" # Disable interactive apt install sessions
48+
GIT_CLONE_PROTECTION_ACTIVE: false
4849

4950
jobs:
5051
run_tests:
51-
name: Run tests ${{ matrix.subset }} with ${{ matrix.os }}, Python ${{ matrix.py_v}}, RedisAI ${{ matrix.rai }}
52+
name: Run tests ${{ matrix.subset }} with ${{ matrix.os }}, Python ${{ matrix.py_v}}
5253
runs-on: ${{ matrix.os }}
5354
strategy:
5455
fail-fast: false
@@ -62,9 +63,6 @@ jobs:
6263
- os: macos-14
6364
py_v: "3.9"
6465

65-
env:
66-
SMARTSIM_REDISAI: ${{ matrix.rai }}
67-
6866
steps:
6967
- uses: actions/checkout@v4
7068
- uses: actions/setup-python@v5
@@ -108,19 +106,13 @@ jobs:
108106
- name: Install SmartSim (with ML backends)
109107
run: |
110108
python -m pip install git+https://github.com/CrayLabs/SmartRedis.git@develop#egg=smartredis
111-
python -m pip install .[dev,ml]
112-
113-
- name: Install ML Runtimes with Smart (with pt, tf, and onnx support)
114-
if: contains( matrix.os, 'ubuntu' ) || contains( matrix.os, 'macos-12')
115-
run: smart build --device cpu --onnx -v
109+
python -m pip install .[dev,mypy]
116110
117-
- name: Install ML Runtimes with Smart (no ONNX,TF on Apple Silicon)
118-
if: contains( matrix.os, 'macos-14' )
119-
run: smart build --device cpu --no_tf -v
111+
- name: Install ML Runtimes
112+
run: smart build --device cpu -v
120113

121114
- name: Run mypy
122115
run: |
123-
python -m pip install .[mypy]
124116
make check-mypy
125117
126118
- name: Run Pylint
@@ -164,7 +156,7 @@ jobs:
164156
retention-days: 5
165157

166158
- name: Upload Pytest coverage to Codecov
167-
uses: codecov/codecov-action@v3.1.4
159+
uses: codecov/codecov-action@v4.5.0
168160
with:
169161
fail_ci_if_error: false
170162
files: ./coverage.xml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ tests/test_output
1212
# Dependencies
1313
smartsim/_core/.third-party
1414
smartsim/_core/.dragon
15+
smartsim/_core/build
1516

1617
# Docs
1718
_build

.readthedocs.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ build:
2323
- git clone --depth 1 https://github.com/CrayLabs/SmartRedis.git smartredis
2424
- git clone --depth 1 https://github.com/CrayLabs/SmartDashboard.git smartdashboard
2525
post_create_environment:
26-
- python -m pip install .[dev]
26+
- python -m pip install .[dev,docs]
2727
- cd smartredis; python -m pip install .
2828
- cd smartredis/doc; doxygen Doxyfile_c; doxygen Doxyfile_cpp; doxygen Doxyfile_fortran
2929
- ln -s smartredis/examples ./examples
@@ -37,7 +37,3 @@ build:
3737
sphinx:
3838
configuration: doc/conf.py
3939
fail_on_warning: true
40-
41-
python:
42-
install:
43-
- requirements: doc/requirements-doc.txt

.wci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
language: Python
2323

2424
release:
25-
version: 0.7.0
26-
date: 2024-05-14
25+
version: 0.8.0
26+
date: 2024-09-25
2727

2828
documentation:
2929
general: https://www.craylabs.org/docs/overview.html

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ tutorials-dev:
150150
@docker compose build tutorials-dev
151151
@docker run -p 8888:8888 smartsim-tutorials:dev-latest
152152

153-
# help: tutorials-prod - Build and start a docker container to run the tutorials (v0.7.0)
153+
# help: tutorials-prod - Build and start a docker container to run the tutorials (v0.8.0)
154154
.PHONY: tutorials-prod
155155
tutorials-prod:
156156
@docker compose build tutorials-prod
157-
@docker run -p 8888:8888 smartsim-tutorials:v0.7.0
157+
@docker run -p 8888:8888 smartsim-tutorials:v0.8.0
158158

159159

160160
# help:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,11 +643,11 @@ from C, C++, Fortran and Python with the SmartRedis Clients:
643643
<tr>
644644
<td rowspan="3">1.2.7</td>
645645
<td>PyTorch</td>
646-
<td>2.0.1</td>
646+
<td>2.1.0</td>
647647
</tr>
648648
<tr>
649649
<td>TensorFlow\Keras</td>
650-
<td>2.13.1</td>
650+
<td>2.15.0</td>
651651
</tr>
652652
<tr>
653653
<td>ONNX</td>

conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def print_test_configuration() -> None:
120120

121121
def pytest_configure() -> None:
122122
pytest.test_launcher = test_launcher
123-
pytest.wlm_options = ["slurm", "pbs", "lsf", "pals", "dragon"]
123+
pytest.wlm_options = ["slurm", "pbs", "lsf", "pals", "dragon", "sge"]
124124
account = get_account()
125125
pytest.test_account = account
126126
pytest.test_device = test_device

doc/_static/version_names.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"version_names":[
33
"develop (unstable)",
4-
"0.7.0 (stable)",
4+
"0.8.0 (stable)",
5+
"0.7.0",
56
"0.6.2",
67
"0.6.1",
78
"0.6.0",
@@ -15,6 +16,7 @@
1516
"version_urls": [
1617
"https://www.craylabs.org/develop/overview.html",
1718
"https://www.craylabs.org/docs/overview.html",
19+
"https://www.craylabs.org/docs/versions/0.7.0/overview.html",
1820
"https://www.craylabs.org/docs/versions/0.6.2/overview.html",
1921
"https://www.craylabs.org/docs/versions/0.6.1/overview.html",
2022
"https://www.craylabs.org/docs/versions/0.6.0/overview.html",

0 commit comments

Comments
 (0)