Skip to content

Commit

Permalink
switch to tfds array_record, improve visualization, dataset descripti…
Browse files Browse the repository at this point in the history
…ons (#190)

* improve visualization

* habana vis

* update plots

* fix horovod training

* update click vis

* update visualization

* swap back y and z

---------

Co-authored-by: Javier Duarte <jduarte@ucsd.edu>
Former-commit-id: 1176df0
  • Loading branch information
jpata and jmduarte committed Aug 28, 2023
1 parent 78a564b commit 279f6ae
Show file tree
Hide file tree
Showing 60 changed files with 1,052 additions and 1,420 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:

jobs:
deps:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
deps-pyg:
Expand All @@ -25,110 +25,110 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: pip3 install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
- run: pip install pyg-lib torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric==2.2.0 -f https://data.pyg.org/whl/torch-1.13.0+cpu.html

tf-clic-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: ./scripts/local_test_clic_pipeline.sh

tf-clic-hits-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: ./scripts/local_test_clic_hits_pipeline.sh

tf-delphes-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: ./scripts/local_test_delphes_pipeline.sh

tf-cms-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: ./scripts/local_test_cms_pipeline.sh

pyg-cms-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps-pyg]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: pip3 install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
- run: pip install pyg-lib torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric==2.2.0 -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
- run: ./scripts/local_test_pyg_cms.sh

pyg-delphes-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps-pyg]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: pip3 install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
- run: pip install pyg-lib torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric==2.2.0 -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
- run: ./scripts/local_test_pyg_delphes.sh

pyg-clic-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps-pyg]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: pip3 install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
- run: pip install pyg-lib torch-scatter torch-sparse torch-cluster torch-spline-conv torch-geometric==2.2.0 -f https://data.pyg.org/whl/torch-1.13.0+cpu.html
- run: ./scripts/local_test_pyg_clic.sh

pyg-ssl-pipeline:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [deps-pyg]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8.10'
python-version: '3.10'
cache: 'pip'
- run: pip install -r requirements.txt
- run: pip3 install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ nohup.out
slurm-*.out

.vscode

models

*.root

logs
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ repos:
# E203 is not PEP8 compliant
# E402 due to logging.basicConfig in pipeline.py
args: ['--max-line-length=125', # github viewer width
'--extend-ignore=E203,E402']
'--extend-ignore=E203,E402,W605']
3 changes: 3 additions & 0 deletions apptainer/python_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ imageio-ffmpeg
ipyparallel
isort
jupyter
jupyterlab
kaleido
line_profiler
lmfit
lz4
Expand All @@ -45,6 +47,7 @@ pre-commit
pyarrow
pydot
pygraphviz
pyhf
pymultinest
pynbody
pytest
Expand Down
1 change: 0 additions & 1 deletion apptainer/python_tf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ tensorflow-datasets
tensorflow-estimator
tensorflow-model-optimization
tensorflow-text
tf-models-official
tf2onnx
transformers
7 changes: 5 additions & 2 deletions apptainer/tf-2.13.0.singularity
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ Bootstrap: docker
From: tensorflow/tensorflow:2.13.0-gpu-jupyter

%files
python_base.txt /opt/python_base.txt
python_tf.txt /opt/python_tf.txt
specs/python_base.txt /opt/python_base.txt
specs/python_tf.txt /opt/python_tf.txt

%post
apt update -y --fix-missing
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y tzdata
apt install -y make cmake parallel gcc g++ gfortran binutils
apt install -y libblas3 libblas-dev liblapack3 liblapack-dev libatlas3-base libatlas-base-dev
apt install -y libtcmalloc-minimal4
Expand All @@ -19,6 +20,8 @@ From: tensorflow/tensorflow:2.13.0-gpu-jupyter
python3 -m pip install -r /opt/python_base.txt
python3 -m pip install -r /opt/python_tf.txt
python3 -m pip install hls4ml[profiling]
HOROVOD_WITH_TENSORFLOW=1 python3 -m pip install horovod[tensorflow,keras]
python3 -m pip install open3d-cpu

%environment
export PIP_DEFAULT_TIMEOUT=500
Expand Down
Empty file removed mlpf/data_clic/__init__.py
Empty file.
Loading

0 comments on commit 279f6ae

Please sign in to comment.