Skip to content

Commit

Permalink
Drop python 3.9, drop Summit
Browse files Browse the repository at this point in the history
  • Loading branch information
al-rigazzi committed Dec 18, 2024
1 parent f509ad6 commit a1ca332
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 126 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.10'

- name: Install build
run: python -m pip install 'build>=1.2.2,<2'
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ jobs:
os: [macos-14, ubuntu-22.04] # Operating systems
compiler: [8] # GNU compiler version
rai: [1.2.7] # Redis AI versions
py_v: ["3.9", "3.10", "3.11"] # Python versions
exclude:
- os: macos-14
py_v: "3.9"
py_v: ["3.10", "3.11"] # Python versions

steps:
- uses: actions/checkout@v4
Expand All @@ -84,7 +81,7 @@ jobs:
echo "$(brew --prefix)/opt/make/libexec/gnubin" >> $GITHUB_PATH
- name: Build Singularity from source
if: contains( matrix.os, 'ubuntu' ) && matrix.py_v == 3.9
if: contains( matrix.os, 'ubuntu' ) && matrix.py_v == 3.10
run: |
sudo apt-get install -y libseccomp-dev pkg-config squashfs-tools cryptsetup curl git # wget build-essential
echo 'export PATH=/usr/local/go/bin:$PATH' >> ~/.bashrc
Expand All @@ -98,7 +95,7 @@ jobs:
sudo make -C builddir install
- name: singularity pull test container # This lets us time how long the pull takes
if: contains( matrix.os, 'ubuntu' ) && matrix.py_v == 3.9
if: contains( matrix.os, 'ubuntu' ) && matrix.py_v == 3.10
run: singularity pull docker://alrigazzi/smartsim-testing

# Note: The develop branch of smartredis is installed first to ensure that any tests that depend
Expand Down
18 changes: 9 additions & 9 deletions doc/installation_instructions/basic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Basic

The base prerequisites to install SmartSim and SmartRedis wtih CPU-only support are:

- Python 3.9-3.11
- Python 3.10-3.11
- Pip
- Cmake 3.13.x (or later)
- C compiler
Expand Down Expand Up @@ -77,7 +77,7 @@ Linux
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.3.1
- 2.14.1
- 1.17.3
Expand All @@ -98,7 +98,7 @@ Linux
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.3.1
- 2.17
- 1.17.3
Expand All @@ -114,7 +114,7 @@ Linux
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.4.1
- N/A
- N/A
Expand All @@ -130,7 +130,7 @@ Linux
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.4.0
- 2.15
- 1.17.3
Expand All @@ -151,7 +151,7 @@ MacOSX
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.4.0
- 2.17
- 1.17.3
Expand All @@ -167,7 +167,7 @@ MacOSX
- Torch
- Tensorflow
- ONNX Runtime
* - 3.9-3.11
* - 3.10-3.11
- 2.2.0
- 2.15
- 1.17.3
Expand Down Expand Up @@ -328,9 +328,9 @@ SmartSim does.
* - Platform
- Python Versions
* - MacOS
- 3.9 - 3.11
- 3.10 - 3.11
* - Linux
- 3.9 - 3.11
- 3.10 - 3.11

The Python client for SmartRedis is installed through ``pip`` as follows:

Expand Down
5 changes: 0 additions & 5 deletions doc/installation_instructions/platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,8 @@ that SmartSim may be used on.

.. include:: platform/ncar-cheyenne.rst

.. include:: platform/olcf-summit.rst

.. include:: platform/pml-scylla.rst

.. _site_installation:

.. include:: site-install.rst



75 changes: 0 additions & 75 deletions doc/installation_instructions/platform/olcf-summit.rst

This file was deleted.

4 changes: 2 additions & 2 deletions doc/smartsim_zoo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ can find a more detailed description of each example in the `SmartSim Zoo
- National Center for Atmospheric Research (NCAR)
* - Cheyenne
- National Center for Atmospheric Research (NCAR)
* - Summit
- Oak Ridge National Lab
* - Theta
- Argonne National Lab
* - ThetaGPU
- Argonne National Lab
* - Scylla
- Plymouth Marine Laboratory

.. list-table:: Current CrayLabs Collaborations
:widths: 100 150 100
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build-backend = "setuptools.build_meta"

[tool.black]
line-length = 88
target-version = ['py39', 'py310', 'py311']
target-version = ['py310', 'py311']
exclude = '''
(
| \.egg
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ contact_email = [email protected]
license = BSD 2-Clause License
keywords = scientific, ai, workflow, hpc, analysis
classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
License :: OSI Approved :: BSD License
Expand All @@ -52,7 +51,7 @@ classifiers =
[options]
packages = find:
include_package_data = True
python_requires = >=3.9,<3.12
python_requires = >=3.10,<3.12

[options.packages.find]
include =
Expand Down
4 changes: 2 additions & 2 deletions smartsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
# pylint: disable-next=useless-import-alias
from .version import __version__ as __version__

if sys.version_info < (3, 9): # pragma: no cover
sys.exit("Python 3.9 or greater must be used with SmartSim.")
if sys.version_info < (3, 10): # pragma: no cover
sys.exit("Python 3.10 or greater must be used with SmartSim.")

# Main API module
# pylint: disable=wrong-import-position
Expand Down
4 changes: 2 additions & 2 deletions smartsim/_core/_cli/scripts/dragon_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ def filter_assets(assets: t.Collection[GitReleaseAsset]) -> t.Optional[GitReleas
:param assets: The collection of dragon release assets to filter
:returns: An asset meeting platform & version filtering requirements"""
# Expect cray & non-cray assets that require a filter, e.g.
# 'dragon-0.8-py3.9.4.1-bafaa887f.tar.gz',
# 'dragon-0.8-py3.9.4.1-CRAYEX-ac132fe95.tar.gz'
# 'dragon-0.8-py3.10.4.1-bafaa887f.tar.gz',
# 'dragon-0.8-py3.10.4.1-CRAYEX-ac132fe95.tar.gz'
asset = next(
(
asset
Expand Down
2 changes: 1 addition & 1 deletion smartsim/_core/_install/buildenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class Versioner:
"""

# compatible Python version
PYTHON_MIN = Version_("3.9.0")
PYTHON_MIN = Version_("3.10.0")

# Versions
SMARTSIM = Version_(get_env("SMARTSIM_VERSION", "0.8.0"))
Expand Down
16 changes: 8 additions & 8 deletions tests/test_configs/telemetry/ensembles.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -77,7 +77,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -113,7 +113,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -149,7 +149,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -185,7 +185,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -221,7 +221,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -257,7 +257,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down Expand Up @@ -293,7 +293,7 @@
],
"run_settings": {
"exe": [
"/home/someuser/.pyenv/versions/3.9.16/envs/ss/bin/python"
"/home/someuser/.pyenv/versions/3.10.16/envs/ss/bin/python"
],
"run_command": null,
"run_args": {}
Expand Down
17 changes: 5 additions & 12 deletions tests/test_dragon_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
pytestmark = pytest.mark.group_a


mock_archive_name = "dragon-0.8-py3.9.4.1-CRAYEX-ac132fe95.tar.gz"
mock_archive_name = "dragon-0.8-py3.10.4.1-CRAYEX-ac132fe95.tar.gz"
_git_attr = namedtuple("_git_attr", "value")


Expand Down Expand Up @@ -102,7 +102,7 @@ def test_assets(monkeypatch: pytest.MonkeyPatch) -> t.Dict[str, GitReleaseAsset]
assets: t.List[GitReleaseAsset] = []
mock_archive_name_tpl = "{}-{}.4.1-{}ac132fe95.tar.gz"

for python_version in ["py3.9", "py3.10", "py3.11"]:
for python_version in ["py3.10", "py3.11"]:
for dragon_version in ["dragon-0.8", "dragon-0.9", "dragon-0.10"]:
for platform in ["", "CRAYEX-"]:

Expand Down Expand Up @@ -187,29 +187,22 @@ def test_retrieve_cached(
@pytest.mark.parametrize(
"dragon_pin,pyv,is_found,is_crayex",
[
pytest.param("0.8", "py3.8", False, False, id="0.8,python 3.8"),
pytest.param("0.8", "py3.9", True, False, id="0.8,python 3.9"),
pytest.param("0.8", "py3.10", True, False, id="0.8,python 3.10"),
pytest.param("0.8", "py3.11", True, False, id="0.8,python 3.11"),
pytest.param("0.8", "py3.12", False, False, id="0.8,python 3.12"),
pytest.param("0.8", "py3.8", False, True, id="0.8,python 3.8,CrayEX"),
pytest.param("0.8", "py3.9", True, True, id="0.8,python 3.9,CrayEX"),
pytest.param("0.8", "py3.10", True, True, id="0.8,python 3.10,CrayEX"),
pytest.param("0.8", "py3.11", True, True, id="0.8,python 3.11,CrayEX"),
pytest.param("0.8", "py3.12", False, True, id="0.8,python 3.12,CrayEX"),
pytest.param("0.9", "py3.8", False, False, id="0.9,python 3.8"),
pytest.param("0.9", "py3.9", True, False, id="0.9,python 3.9"),
pytest.param("0.9", "py3.10", True, False, id="0.9,python 3.10"),
pytest.param("0.9", "py3.11", True, False, id="0.9,python 3.11"),
pytest.param("0.9", "py3.12", False, False, id="0.9,python 3.12"),
pytest.param("0.9", "py3.8", False, True, id="0.9,python 3.8,CrayEX"),
pytest.param("0.9", "py3.9", True, True, id="0.9,python 3.9,CrayEX"),
pytest.param("0.9", "py3.10", True, True, id="0.9,python 3.10,CrayEX"),
pytest.param("0.9", "py3.11", True, True, id="0.9,python 3.11,CrayEX"),
pytest.param("0.9", "py3.12", False, True, id="0.9,python 3.12,CrayEX"),
# add a couple variants for a dragon version that isn't in the asset list
pytest.param("0.7", "py3.9", False, False, id="0.7,python 3.9"),
pytest.param("0.7", "py3.9", False, True, id="0.7,python 3.9,CrayEX"),
pytest.param("0.7", "py3.10", False, False, id="0.7,python 3.10"),
pytest.param("0.7", "py3.10", False, True, id="0.7,python 3.10,CrayEX"),
],
)
def test_retrieve_asset_info(
Expand Down

0 comments on commit a1ca332

Please sign in to comment.