Skip to content

Commit

Permalink
Use current tardis (#142)
Browse files Browse the repository at this point in the history
* Use current version of stardis in stardis conda environment

* Use current tardis in stardis_cuda environment

* Render unified lockfile format for stardis environment

* Render unified lockfile for stardis-cuda environment

* Render platform-specific lockfiles

* Change installation docs to use current version of tardis

* Use current version of stardis in github unit tests

* Change location of restructured tardis libraries

* Use current versions of python packages in stardis conda environment

* Use current versions of python packages in stardis cuda environment

* Render unified lockfile for stardis environment with current versions of Python packages

* Render unified lockfile for stardis-cuda environment with current versions of Python packages

* Render platform-specific lockfiles with current versions of python packages

* Unpin `tardis` version to use the current version for `build-docs.yml`

* Remove pinned version of `tardis` in benchmarks, replaced by current version

* Change location of restructured `tardis` libraries in `benchmarks/run_stardis.py`

* Change import to reflect relocation of tardis `config_reader`
  • Loading branch information
smokestacklightnin authored Oct 30, 2023
1 parent a20f718 commit febe678
Show file tree
Hide file tree
Showing 14 changed files with 4,470 additions and 4,142 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: benchmarks

env:
TARDIS_VER: release-2023.06.18
TARDIS_VER: master # release-2023.06.18

on:
push:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Add TARDIS install command to asv config file
run: |
TARDIS_INSTALL_CMD="pip install git+https://github.com/tardis-sn/tardis.git@${{ env.TARDIS_VER }}"
TARDIS_INSTALL_CMD="pip install git+https://github.com/tardis-sn/tardis.git" # @${{ env.TARDIS_VER }}"
cat <<< $(jq '.build_command |= [$TARDIS_INSTALL_CMD] + .' --arg TARDIS_INSTALL_CMD "${TARDIS_INSTALL_CMD}" asv.conf.json) > asv.conf.json
- name: Run benchmarks for last 5 commits if not PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
id: install-tardis
# shell: bash -l {0}
run: |
pip install git+https://github.com/tardis-sn/[email protected]
pip install git+https://github.com/tardis-sn/tardis.git # @release-2023.04.16
- name: Install STARDIS
id: install-stardis
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
id: install-tardis
# shell: bash -l {0}
run: |
pip install git+https://github.com/tardis-sn/tardis.git@release-2023.04.16
pip install git+https://github.com/tardis-sn/tardis.git
- name: Install STARDIS
id: install-stardis
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/run_stardis.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from astropy import units as u

from tardis.io.atom_data import AtomData
from tardis.io.config_validator import validate_yaml
from tardis.io.config_reader import Configuration
from tardis.io.configuration.config_validator import validate_yaml
from tardis.io.configuration.config_reader import Configuration

from stardis.io.model.marcs import read_marcs_model
from stardis.plasma import create_stellar_plasma
Expand Down
338 changes: 173 additions & 165 deletions conda-linux-64-cuda.lock

Large diffs are not rendered by default.

333 changes: 170 additions & 163 deletions conda-linux-64.lock

Large diffs are not rendered by default.

Loading

0 comments on commit febe678

Please sign in to comment.