Skip to content

Commit

Permalink
Merge pull request #648 from mlcommons/version_update_for_development
Browse files Browse the repository at this point in the history
Version update for development
  • Loading branch information
sarthakpati committed May 18, 2023
2 parents ea4e5de + aea457a commit 6711763
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 26 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,33 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: '3.8'
- name: Check dev version
run: | # Get current canonical version, append current date as an identifier
currentVer=$(python -c "from GANDLF import version; print(version)")
if [[ $currentVer == *"dev"* ]]; then
echo "publish_nightly=true" >> $GITHUB_ENV
else
echo "publish_nightly=false" >> $GITHUB_ENV
fi
- name: Install dependencies
if: env.publish_nightly
run: |
python -m pip install --upgrade pip
pip install scikit-build
pip install -e .
pip install build
- name: Annotate version
if: env.publish_nightly
run: | # Get current canonical version, append current date as an identifier
currentVer=$(python -c "from GANDLF import version; print(version)")
datestampnow=$(date +'%Y%m%d')
echo __version__ = \"$currentVer$datestampnow\" > ./GANDLF/version.py
echo __version__ = \"$currentVer-dev$datestampnow\" > ./GANDLF/version.py
- name: Build package
if: env.publish_nightly
run: python -m build
- name: Publish package
- name: Publish package
if: env.publish_nightly
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
with:
user: __token__
Expand Down
2 changes: 1 addition & 1 deletion GANDLF/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env python3
# -*- coding: UTF-8 -*-
__version__ = "0.0.16"
__version__ = "0.0.17-dev"
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 0.0.17


## 0.0.16
- Added a script "gandlf_deploy", allowing deployment of models into MLCubes (currently requires Docker)
- ImageNet pre-trained models for UNet with variable encoders is now available
Expand Down
4 changes: 2 additions & 2 deletions mlcube/workspace/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
verbose: True
# Choose the model parameters here
Expand Down
4 changes: 2 additions & 2 deletions samples/config_all_options.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
## Choose the model parameters here
model:
Expand Down
4 changes: 2 additions & 2 deletions samples/config_classification.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
# Choose the model parameters here
model:
Expand Down
2 changes: 1 addition & 1 deletion samples/config_getting_started_classification_histo2d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ scheduler:
track_memory_usage: false
verbose: false
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: true
which_model: resunet
2 changes: 1 addition & 1 deletion samples/config_getting_started_classification_rad3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ scheduler:
track_memory_usage: false
verbose: false
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: true
which_model: resunet
2 changes: 1 addition & 1 deletion samples/config_getting_started_regression_histo2d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ scheduler:
track_memory_usage: false
verbose: false
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: true
which_model: resunet
2 changes: 1 addition & 1 deletion samples/config_getting_started_regression_rad3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ scheduler:
track_memory_usage: false
verbose: false
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: false
which_model: resunet
2 changes: 1 addition & 1 deletion samples/config_getting_started_segmentation_histo2d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ scheduler:
track_memory_usage: false
verbose: true
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: true
4 changes: 2 additions & 2 deletions samples/config_getting_started_segmentation_rad3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ scheduler:
track_memory_usage: false
verbose: true
version:
maximum: 0.0.16
minimum: 0.0.16
maximum: 0.0.17
minimum: 0.0.17
weighted_loss: true
4 changes: 2 additions & 2 deletions samples/config_regression.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
# Choose the model parameters here
model:
Expand Down
4 changes: 2 additions & 2 deletions samples/config_segmentation_brats.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
# Choose the model parameters here
model:
Expand Down
4 changes: 2 additions & 2 deletions samples/config_segmentation_histology.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# affix version
version:
{
minimum: 0.0.16,
maximum: 0.0.16 # this should NOT be made a variable, but should be tested after every tag is created
minimum: 0.0.17,
maximum: 0.0.17 # this should NOT be made a variable, but should be tested after every tag is created
}
# Choose the model parameters here
model:
Expand Down
2 changes: 1 addition & 1 deletion testing/config_classification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ save_output: false
scaling_factor: 1
scheduler: triangle
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: True
which_model: resunet
2 changes: 1 addition & 1 deletion testing/config_regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ save_output: false
scaling_factor: 1
scheduler: triangle
version:
maximum: 0.0.16
maximum: 0.0.17
minimum: 0.0.14
weighted_loss: false
which_model: resunet
2 changes: 1 addition & 1 deletion testing/config_segmentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version:
{
minimum: 0.0.14,
maximum: 0.0.16
maximum: 0.0.17
}
model:
{
Expand Down

0 comments on commit 6711763

Please sign in to comment.