Merge pull request #96 from AlexMontgomerie/dev

Dev

.github/workflows/integration-testing.yml

@@ -2,9 +2,9 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -15,20 +15,40 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
+    - name: Checkout optimiser repo
+      uses: actions/checkout@v4
+
+    - name: Fetch model repo
+      run: |
+        BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
+        URL=https://github.com/AlexMontgomerie/fpgaconvnet-model.git    
+        if [ -z $(git ls-remote --heads $URL $BRANCH) ]; then
+          echo "Warning! branch $BRANCH does not exist. use dev instead"
+          BRANCH="dev"
+        else
+          echo "checkout branch $BRANCH sucessfully"
+        fi
+        git clone --branch $BRANCH $URL fpgaconvnet-model
+
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.7.x'
+        python-version: '3.10' 
+
     - name: Install dependencies
       run: |
-        sudo apt-get install protobuf-compiler libprotoc-dev
-        python setup.py install
-    - name: Run Tests
+        sudo apt-get install protobuf-compiler libprotoc-dev graphviz
+        python -m pip install --upgrade pip
+
+        # for some unknown reason, these packages need special care
+        python -m pip install wheel
+        python -m pip install nvidia-pyindex 
+        python -m pip install onnx-graphsurgeon
+
+        python -m pip install .
+        python -m pip install ./fpgaconvnet-model
+        
+    - name: Run Optimisation Tests
       run: |
-          python -m coverage run --source=fpgaconvnet_optimiser -m unittest discover tests/
-    # - name: Upload Coverage to Codecov
-    #   uses: codecov/codecov-action@v1
-    #   with:
-    #     token: ${{ secrets.CODECOV_TOKEN  }}
+        bash tests/run_models.sh
 

README.md

@@ -52,6 +52,12 @@ python -m fpgaconvnet.optimiser.latency --name c3d \
 ```
 The same files are generated as before in this case.
 
+
+### Running WandB Sweeps
+To run a sweep on wandb, you can use the following command:
+```
+python -m fpgaconvnet.optimiser.sweep_wandb -n unet -m examples/models/unet.onnx -p examples/platforms/u200.toml -o outputs/unet/throughput/u200 -b 1 --objective throughput --optimiser greedy_partition --optimiser_config_path examples/optimisers/single_partition_throughput.toml --enable-wandb --sweep-wandb
+```
 ---
 
 Feel free to post an issue if you have any questions or problems!