Skip to content

Commit

Permalink
224 break when env installation fails on user installation script (#225)
Browse files Browse the repository at this point in the history
* Update itwinai-installer.sh

* Update generic_torch.sh

* Update generic_tf.sh

* Update CITATION.cff

* Update conf.py

* Update AUTHORS.md
  • Loading branch information
matbun authored Oct 14, 2024
1 parent 5fb6256 commit 4451b6f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 33 deletions.
5 changes: 1 addition & 4 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Authors

## Maintainers
## Main developer

Matteo Bunino \<[[email protected]](mailto:[email protected])\>
Rakesh Sarma \<[[email protected]](mailto:[email protected])\>
Mario Ruettgers \<[[email protected]](mailto:[email protected])\>
Kalliopi Tsolaki \<[[email protected]](mailto:[email protected])\>

## Contributors

Expand Down
13 changes: 0 additions & 13 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@ authors:
email: [email protected]
affiliation: CERN
orcid: 'https://orcid.org/0009-0008-5100-9300'
- given-names: Rakesh
family-names: Sarma
email: [email protected]
affiliation: FZ Juelich
- given-names: Mario
family-names: Ruettgers
affiliation: FZ Juelich
email: [email protected]
- given-names: Kalliopi
family-names: Tsolaki
email: [email protected]
affiliation: CERN
orcid: 'https://orcid.org/0000-0002-3192-4260'
repository-code: 'https://github.com/interTwin-eu/itwinai'
url: 'https://itwinai.readthedocs.io/'
abstract: AI on cloud and HPC made simple for science
Expand Down
14 changes: 2 additions & 12 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,13 @@

exclude_patterns = 'requirements.txt'

# sys.path.insert(0, os.path.abspath('../use-cases/'))
# sys.path.insert(0, os.path.abspath('../use-cases/3dgan/'))
# sys.path.insert(0, os.path.abspath('../use-cases/mnist/torch-lightning/'))
# sys.path.insert(0, os.path.abspath('../use-cases/mnist/torch/'))
sys.path.insert(0, os.path.abspath('../tutorials/ml-workflows/'))
# sys.path.insert(0, os.path.abspath('../tutorials/distributed-ml/'))
# sys.path.insert(0, os.path.abspath('../src/itwinai'))
# sys.path.insert(0, os.path.abspath('../src/itwinai/tensorflow'))
# sys.path.insert(0, os.path.abspath('../src/itwinai/torch'))
sys.path.insert(0, os.path.abspath('../src'))
sys.path.insert(0, os.path.abspath('../images'))
# sys.path.insert(0, os.path.abspath('../...'))

project = 'itwinai'
copyright = ('2024, Matteo Bunino, Kalliopi Tsolaki, '
'Rakesh Sarma, Mario Ruettgers on behalf of CERN & JSC')
author = 'Matteo Bunino, Kalliopi Tsolaki, Rakesh Sarma, Mario Ruettgers'
copyright = ('2024, Matteo Bunino on behalf of CERN')
author = 'Matteo Bunino'
version = '0.2' # short version
release = '0.2.2' # full version

Expand Down
4 changes: 2 additions & 2 deletions env-files/itwinai-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ fi
if [ "$ML_FRAMEWORK" == "pytorch" ]; then
echo "Installing itwinai with PyTorch support..."
# Skip last line (head -n -1) because it contains the istallation of itwinai
curl -fsSL https://github.com/interTwin-eu/itwinai/raw/main/env-files/torch/generic_torch.sh | sed '$d' | bash
curl -fsSL https://github.com/interTwin-eu/itwinai/raw/main/env-files/torch/generic_torch.sh | sed '$d' | bash || exit 1
# cat ../env-files/torch/generic_torch.sh | head -n -1 | bash
# Install from PyPI
pip install itwinai[torch]
elif [ "$ML_FRAMEWORK" == "tensorflow" ]; then
echo "Installing itwinai with TensorFlow support..."
# Skip last line (head -n -1) because it contains the istallation of itwinai
curl -fsSL https://github.com/interTwin-eu/itwinai/raw/main/env-files/tensorflow/generic_tf.sh | sed '$d' | bash
curl -fsSL https://github.com/interTwin-eu/itwinai/raw/main/env-files/tensorflow/generic_tf.sh | sed '$d' | bash || exit 1
# cat ../env-files/tensorflow/generic_tf.sh | head -n -1 | bash
# Install from PyPI
pip install itwinai
Expand Down
2 changes: 1 addition & 1 deletion env-files/tensorflow/generic_tf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ else
pip install "prov4ml[linux]@git+https://github.com/matbun/ProvML@main" || exit 1
fi

# itwinai
# Install itwinai: MUST be last line of the script for the user installation script to work!
pip3 install --no-cache-dir -e .[dev]
2 changes: 1 addition & 1 deletion env-files/torch/generic_torch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,5 @@ else
pip install --no-cache-dir "prov4ml[linux]@git+https://github.com/matbun/ProvML" || exit 1
fi

# Install itwinai
# Install itwinai: MUST be last line of the script for the user installation script to work!
pip install --no-cache-dir -e .[torch,dev] || exit 1

0 comments on commit 4451b6f

Please sign in to comment.