Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use current tardis #142

Merged
merged 17 commits into from
Oct 30, 2023
Merged

Use current tardis #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3abf04a
Use current version of stardis in stardis conda environment
smokestacklightnin Oct 27, 2023
cbd2fe4
Use current tardis in stardis_cuda environment
smokestacklightnin Oct 27, 2023
4c7b542
Render unified lockfile format for stardis environment
smokestacklightnin Oct 27, 2023
45a1c75
Render unified lockfile for stardis-cuda environment
smokestacklightnin Oct 27, 2023
abfc12f
Render platform-specific lockfiles
smokestacklightnin Oct 27, 2023
749d40c
Change installation docs to use current version of tardis
smokestacklightnin Oct 27, 2023
c955526
Use current version of stardis in github unit tests
smokestacklightnin Oct 27, 2023
3cfa75c
Change location of restructured tardis libraries
smokestacklightnin Oct 27, 2023
425d7e0
Use current versions of python packages in stardis conda environment
smokestacklightnin Oct 30, 2023
2c1cd56
Use current versions of python packages in stardis cuda environment
smokestacklightnin Oct 30, 2023
7f0ec3d
Render unified lockfile for stardis environment with current versions…
smokestacklightnin Oct 30, 2023
2df1c9c
Render unified lockfile for stardis-cuda environment with current ver…
smokestacklightnin Oct 30, 2023
cfe7fab
Render platform-specific lockfiles with current versions of python pa…
smokestacklightnin Oct 30, 2023
d2ca39f
Unpin `tardis` version to use the current version for `build-docs.yml`
smokestacklightnin Oct 30, 2023
f3b6f21
Remove pinned version of `tardis` in benchmarks, replaced by current …
smokestacklightnin Oct 30, 2023
003f797
Change location of restructured `tardis` libraries in `benchmarks/run…
smokestacklightnin Oct 30, 2023
ef7c4fe
Change import to reflect relocation of tardis `config_reader`
smokestacklightnin Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

Large diffs are not rendered by default.

333 changes: 170 additions & 163 deletions conda-linux-64.lock
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading