Skip to content

Commit

Permalink
Release v0.8.0 (#730)
Browse files Browse the repository at this point in the history
Merge develop to master for release

[ committed by @MattToast ]
[ reviewed by @al-rigazzi ]
  • Loading branch information
MattToast authored Sep 27, 2024
2 parents 5039699 + 0bab07c commit 528c1ae
Show file tree
Hide file tree
Showing 116 changed files with 6,239 additions and 2,806 deletions.
95 changes: 24 additions & 71 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,108 +32,61 @@ on:
release:
types: [published]


env:
HOMEBREW_NO_ANALYTICS: "ON" # Make Homebrew installation a little quicker
HOMEBREW_NO_AUTO_UPDATE: "ON"
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: "ON"
HOMEBREW_NO_GITHUB_API: "ON"
HOMEBREW_NO_INSTALL_CLEANUP: "ON"
CIBW_SKIP: "pp* *i686*" # skip building for PyPy
CIBW_ARCHS_MACOS: x86_64
CIBW_ARCHS_LINUX: x86_64 # ppc64le # uncomment to enable powerPC build
CIBW_ENVIRONMENT_MACOS: PATH="$(brew --prefix)/opt/make/libexec/gnubin:$PATH"
MACOSX_DEPLOYMENT_TARGET: "10.09"


jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-12]

build_dists:
name: Build Distributions
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'

- name: Install cibuildwheel
run: python -m pip install cibuildwheel>=2.12.3
- name: Install build
run: python -m pip install 'build>=1.2.2,<2'

- name: Install build-essentials
if: contains(matrix.os, 'ubuntu')
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install -y build-essential
sudo apt-get install -y wget
sudo apt-get install -y build-essential wget
- name: Install GNU make for MacOS
if: contains(matrix.os, 'macos')
run: brew install make || true
- name: Build Distributions
run: python -m build .

- name: list target wheels
run: |
python -m cibuildwheel . --print-build-identifiers
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_ENVIRONMENT_MACOS: PATH="$(brew --prefix)/opt/make/libexec/gnubin:$PATH"
MACOSX_DEPLOYMENT_TARGET: "10.09"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl


build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.9'

- name: Build sdist
run: |
python -m pip install cmake>=3.13
python setup.py sdist
- uses: actions/upload-artifact@v2
with:
path: dist/*.tar.gz
name: distributables
path: ./dist/*


upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
needs: [build_dists]
runs-on: ubuntu-22.04
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
name: distributables
path: dist

- uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI }}
#repository_url: https://test.pypi.org/legacy/

# repository-url: https://test.pypi.org/legacy/

createPullRequest:
runs-on: ubuntu-latest
needs: [upload_pypi]
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Create pull request
run: |
gh pr create -B develop -H master --title 'Merge master into develop' --body 'This PR brings develop up to date with master for release.'
gh pr create -B develop \
-H master \
--title 'Merge master into develop' \
--body 'This PR brings develop up to date with master for release.'
env:
GH_TOKEN: ${{ github.token }}
20 changes: 6 additions & 14 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ env:
HOMEBREW_NO_GITHUB_API: "ON"
HOMEBREW_NO_INSTALL_CLEANUP: "ON"
DEBIAN_FRONTEND: "noninteractive" # Disable interactive apt install sessions
GIT_CLONE_PROTECTION_ACTIVE: false

jobs:
run_tests:
name: Run tests ${{ matrix.subset }} with ${{ matrix.os }}, Python ${{ matrix.py_v}}, RedisAI ${{ matrix.rai }}
name: Run tests ${{ matrix.subset }} with ${{ matrix.os }}, Python ${{ matrix.py_v}}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -62,9 +63,6 @@ jobs:
- os: macos-14
py_v: "3.9"

env:
SMARTSIM_REDISAI: ${{ matrix.rai }}

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -108,19 +106,13 @@ jobs:
- name: Install SmartSim (with ML backends)
run: |
python -m pip install git+https://github.com/CrayLabs/SmartRedis.git@develop#egg=smartredis
python -m pip install .[dev,ml]
- name: Install ML Runtimes with Smart (with pt, tf, and onnx support)
if: contains( matrix.os, 'ubuntu' ) || contains( matrix.os, 'macos-12')
run: smart build --device cpu --onnx -v
python -m pip install .[dev,mypy]
- name: Install ML Runtimes with Smart (no ONNX,TF on Apple Silicon)
if: contains( matrix.os, 'macos-14' )
run: smart build --device cpu --no_tf -v
- name: Install ML Runtimes
run: smart build --device cpu -v

- name: Run mypy
run: |
python -m pip install .[mypy]
make check-mypy
- name: Run Pylint
Expand Down Expand Up @@ -164,7 +156,7 @@ jobs:
retention-days: 5

- name: Upload Pytest coverage to Codecov
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.5.0
with:
fail_ci_if_error: false
files: ./coverage.xml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ tests/test_output
# Dependencies
smartsim/_core/.third-party
smartsim/_core/.dragon
smartsim/_core/build

# Docs
_build
Expand Down
6 changes: 1 addition & 5 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build:
- git clone --depth 1 https://github.com/CrayLabs/SmartRedis.git smartredis
- git clone --depth 1 https://github.com/CrayLabs/SmartDashboard.git smartdashboard
post_create_environment:
- python -m pip install .[dev]
- python -m pip install .[dev,docs]
- cd smartredis; python -m pip install .
- cd smartredis/doc; doxygen Doxyfile_c; doxygen Doxyfile_cpp; doxygen Doxyfile_fortran
- ln -s smartredis/examples ./examples
Expand All @@ -37,7 +37,3 @@ build:
sphinx:
configuration: doc/conf.py
fail_on_warning: true

python:
install:
- requirements: doc/requirements-doc.txt
4 changes: 2 additions & 2 deletions .wci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
language: Python

release:
version: 0.7.0
date: 2024-05-14
version: 0.8.0
date: 2024-09-25

documentation:
general: https://www.craylabs.org/docs/overview.html
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ tutorials-dev:
@docker compose build tutorials-dev
@docker run -p 8888:8888 smartsim-tutorials:dev-latest

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


# help:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -643,11 +643,11 @@ from C, C++, Fortran and Python with the SmartRedis Clients:
<tr>
<td rowspan="3">1.2.7</td>
<td>PyTorch</td>
<td>2.0.1</td>
<td>2.1.0</td>
</tr>
<tr>
<td>TensorFlow\Keras</td>
<td>2.13.1</td>
<td>2.15.0</td>
</tr>
<tr>
<td>ONNX</td>
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def print_test_configuration() -> None:

def pytest_configure() -> None:
pytest.test_launcher = test_launcher
pytest.wlm_options = ["slurm", "pbs", "lsf", "pals", "dragon"]
pytest.wlm_options = ["slurm", "pbs", "lsf", "pals", "dragon", "sge"]
account = get_account()
pytest.test_account = account
pytest.test_device = test_device
Expand Down
4 changes: 3 additions & 1 deletion doc/_static/version_names.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"version_names":[
"develop (unstable)",
"0.7.0 (stable)",
"0.8.0 (stable)",
"0.7.0",
"0.6.2",
"0.6.1",
"0.6.0",
Expand All @@ -15,6 +16,7 @@
"version_urls": [
"https://www.craylabs.org/develop/overview.html",
"https://www.craylabs.org/docs/overview.html",
"https://www.craylabs.org/docs/versions/0.7.0/overview.html",
"https://www.craylabs.org/docs/versions/0.6.2/overview.html",
"https://www.craylabs.org/docs/versions/0.6.1/overview.html",
"https://www.craylabs.org/docs/versions/0.6.0/overview.html",
Expand Down
Loading

0 comments on commit 528c1ae

Please sign in to comment.