Merge pull request #34 from RasmusOrsoe/main

Update branch from main

Author: RasmusOrsoe

.github/actions/install/action.yml

@@ -51,8 +51,9 @@ runs:
       shell: bash
       run: |
         if [[ "${{ inputs.use_vm }}" == "true" ]]; then source ~/venv/bin/activate; fi
-        pip install --upgrade 'pip>=20'
-        pip install --upgrade 'setuptools>=68.2.2'
+        pip install --no-cache-dir --upgrade 'pip>=20'
+        pip install --no-cache-dir --upgrade 'setuptools>=68.2.2'
+        rm -rf ~/.cache/pip
 
     - name: Print pip and setuptools versions
       shell: bash
@@ -67,6 +68,6 @@ runs:
         if [[ "${{ inputs.use_vm }}" == "true" ]]; then source ~/venv/bin/activate; fi
         echo "Installing graphnet with flags: ${{ steps.flags.outputs.user_flag }} ${{ steps.flags.outputs.editable_flag }}"
         echo "pip install ${{ steps.flags.outputs.user_flag }} ${{ steps.flags.outputs.editable_flag }} .[torch-${{ steps.flags.outputs.torch_flag }},${{ inputs.extras }}] -f https://data.pyg.org/whl/torch-${{ inputs.torch_version }}+${{ inputs.hardware }}.html"
-        pip install ${{ steps.flags.outputs.user_flag }} ${{ steps.flags.outputs.editable_flag }} .[torch-${{ steps.flags.outputs.torch_flag }},${{ inputs.extras }}] -f https://data.pyg.org/whl/torch-${{ inputs.torch_version }}+${{ inputs.hardware }}.html
-
-        pip install git+https://github.com/thoglu/jammy_flows.git
+        pip install --no-cache-dir${{ steps.flags.outputs.user_flag }} ${{ steps.flags.outputs.editable_flag }} .[torch-${{ steps.flags.outputs.torch_flag }},${{ inputs.extras }}] -f https://data.pyg.org/whl/torch-${{ inputs.torch_version }}+${{ inputs.hardware }}.html
+        rm -rf ~/.cache/pip
+        pip install --no-cache-dir git+https://github.com/thoglu/jammy_flows.git

.github/workflows/build.yml

@@ -75,6 +75,7 @@ jobs:
           sudo apt update --fix-missing --yes
           sudo apt upgrade --yes
           sudo apt-get install --yes git
+          sudo apt-get clean 
 
       - uses: actions/checkout@v4
 
@@ -86,21 +87,29 @@ jobs:
           pip --version
           python --version
           pip show setuptools
-
+          rm -rf ~/.cache/pip
+      
       - name: Print available disk space before graphnet install
-        run: df -h
-
+        run: | 
+          df -h
       - name: Upgrade packages in virtual environment
         shell: bash
         run: |
           source ~/venv/bin/activate
-          pip install --upgrade astropy
-          pip install --upgrade PyYAML
-          pip install --upgrade psutil
-          pip install --upgrade setuptools
-          pip install --upgrade versioneer
+          pip install --no-cache-dir --upgrade astropy
+          pip install --no-cache-dir --upgrade PyYAML
+          pip install --no-cache-dir --upgrade psutil
+          pip install --no-cache-dir --upgrade setuptools
+          pip install --no-cache-dir --upgrade versioneer
           pip show setuptools
           pip show versioneer
+          rm -rf ~/.cache/pip
+      - name: Install PyTorch and dependencies
+        shell: bash
+        run: |
+          source ~/venv/bin/activate
+          pip3 install --no-cache-dir torch==${{ matrix.torch_version }}+${{ matrix.hardware }} torchvision torchaudio --index-url https://download.pytorch.org/whl/${{ matrix.hardware }}
+          rm -rf ~/.cache/pip
       - name: Install package
         uses: ./.github/actions/install
         with:
@@ -118,6 +127,9 @@ jobs:
           pip show torch-sparse
           pip show torch-scatter
           pip show jammy_flows
+      - name: Print available disk space after graphnet install
+        run: | 
+          df -h
       - name: Run unit tests and generate coverage report
         shell: bash
         run: |

data/geometry_tables/nubench/cluster.parquet

@@ -42,3 +42,4 @@
 PROMETHEUS_GEOMETRY_TABLE_DIR = os.path.join(GEOMETRY_TABLE_DIR, "prometheus")
 LIQUIDO_GEOMETRY_TABLE_DIR = os.path.join(GEOMETRY_TABLE_DIR, "liquid-o")
 MAGIC_GEOMETRY_TABLE_DIR = os.path.join(GEOMETRY_TABLE_DIR, "magic")
+NUBENCH_GEOMETRY_TABLE_DIR = os.path.join(GEOMETRY_TABLE_DIR, "nubench")

data/geometry_tables/nubench/flower_l.parquet

@@ -515,7 +515,7 @@ def _find_data_type(
             sim_type = "genie"
         elif "noise" in input_file:
             sim_type = "noise"
-        elif frame.Has("EventProprties") or frame.Has(
+        elif frame.Has("EventProperties") or frame.Has(
             "LeptonInjectorProperties"
         ):
             sim_type = "LeptonInjector"