Skip to content

Commit 1af4e11

Browse files
Merge branch 'sony:main' into adding_weights_manual_selection_bitwidth
2 parents 2a3c40c + 20c321c commit 1af4e11

File tree

120 files changed

+2724
-1841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2724
-1841
lines changed

.github/workflows/nightly.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
with:
1616
python-version: 3.12
1717

18+
- name: Edit requirements mct-quantizers name # Remove the entire line in requirements.txt so no need special care for the specified version
19+
run: |
20+
sed -i "/mct-quantizers/c\mct-quantizers-nightly" requirements.txt
1821
- name: Install dependencies
1922
run: |
2023
python -m pip install --upgrade pip
@@ -35,4 +38,4 @@ jobs:
3538
run: |
3639
pip install mct-nightly tensorflow torch
3740
version=$(python -c 'import model_compression_toolkit; print(model_compression_toolkit.__version__)')
38-
echo $version
41+
echo $version

.github/workflows/run_keras_tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
with:
2121
python-version: ${{ inputs.python-version }}
2222
- name: Install dependencies
23-
run: |
23+
run: |
24+
sed -i "/mct-quantizers/c\mct-quantizers-nightly" requirements.txt
2425
python -m pip install --upgrade pip
2526
pip install -r requirements.txt
2627
pip install tensorflow==${{ inputs.tf-version }} sony-custom-layers

.github/workflows/run_pytorch_tests.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@ jobs:
1919
uses: actions/setup-python@v5
2020
with:
2121
python-version: ${{ inputs.python-version }}
22+
- name: Modify numpy requirements for Torch 2.2
23+
if: startsWith(inputs.torch-version, '2.2')
24+
run: |
25+
grep -v 'numpy' requirements.txt > temp_requirements.txt
26+
echo "numpy<2" >> temp_requirements.txt
27+
mv temp_requirements.txt requirements.txt
2228
- name: Install dependencies
2329
run: |
30+
sed -i "/mct-quantizers/c\mct-quantizers-nightly" requirements.txt
2431
python -m pip install --upgrade pip
2532
pip install -r requirements.txt
26-
pip install torch==${{ inputs.torch-version }} torchvision onnx onnxruntime onnxruntime-extensions
33+
pip install torch==${{ inputs.torch-version }} torchvision onnx onnxruntime "onnxruntime-extensions<0.14"
2734
pip install pytest pytest-mock
2835
pip check
2936
- name: Run unittests

.github/workflows/run_tests_python310_pytorch20.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_python310_pytorch21.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_python311_pytorch20.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_python311_pytorch21.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_python39_pytorch20.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_python39_pytorch21.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/run_tests_suite_coverage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232

3333
- name: Set up environment for common tests
3434
run: |
35+
sed -i "/mct-quantizers/c\mct-quantizers-nightly" requirements.txt
3536
python -m pip install --upgrade pip
3637
pip install -r requirements.txt coverage pytest pytest-mock
3738
@@ -64,7 +65,7 @@ jobs:
6465
source torch_env/bin/activate
6566
python -m pip install --upgrade pip
6667
pip install -r requirements.txt
67-
pip install torch==2.0.* torchvision onnx onnxruntime onnxruntime-extensions sony-custom-layers coverage pytest pytest-mock
68+
pip install torch==2.5.* torchvision onnx onnxruntime "onnxruntime-extensions<0.14" sony-custom-layers coverage pytest pytest-mock
6869
6970
- name: Run PyTorch tests (unittest)
7071
run: |

0 commit comments

Comments
 (0)