Skip to content

Commit 07c490f

Browse files
authored
Merge pull request #1445 from Trusted-AI/dev_1.9.0
Update to ART 1.9.0
2 parents ebfc47d + 589d345 commit 07c490f

File tree

148 files changed

+8600
-890
lines changed

Some content is hidden

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

148 files changed

+8600
-890
lines changed

.github/actions/deepspeech-v2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN cd warp-ctc/pytorch_binding && python setup.py install
3737

3838
RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git
3939
RUN cd deepspeech.pytorch && git checkout V2.1
40-
RUN cd deepspeech.pytorch && pip install -r requirements.txt
40+
RUN cd deepspeech.pytorch && pip install -r requirements_test.txt
4141
RUN cd deepspeech.pytorch && pip install -e .
4242

4343
RUN pip install numba==0.50.0

.github/actions/deepspeech-v3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN pip install torchaudio==0.6.0
3434
RUN pip install --no-build-isolation fairscale
3535

3636
RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git
37-
RUN cd deepspeech.pytorch && pip install -r requirements.txt
37+
RUN cd deepspeech.pytorch && pip install -r requirements_test.txt
3838
RUN cd deepspeech.pytorch && pip install -e .
3939

4040
RUN pip install numba==0.50.0

.github/actions/goturn/run.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ exit_code=0
44

55
pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_tracking/test_pytorch_goturn.py --framework=pytorch --durations=0
66
if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed estimators/object_tracking/test_pytorch_goturn tests"; fi
7+
pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/evasion/test_adversarial_texture_pytorch.py --framework=pytorch --durations=0
8+
if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed attacks/evasion/test_adversarial_texture_pytorch tests"; fi
79

810
exit ${exit_code}

.github/workflows/ci-keras.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
sudo apt-get update
6464
sudo apt-get -y -q install ffmpeg libavcodec-extra
6565
python -m pip install --upgrade pip setuptools wheel
66-
pip install -r requirements.txt
66+
pip install -r requirements_test.txt
6767
pip install tensorflow==${{ matrix.tensorflow }}
6868
pip install keras==${{ matrix.keras }}
6969
pip install tensorflow-addons==${{ matrix.tf_addons }}

.github/workflows/ci-legacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
sudo apt-get update
5050
sudo apt-get -y -q install ffmpeg libavcodec-extra
5151
python -m pip install --upgrade pip setuptools wheel
52-
pip install -q -r requirements.txt
52+
pip install -q -r requirements_test.txt
5353
pip install tensorflow==${{ matrix.tensorflow }}
5454
pip install keras==${{ matrix.keras }}
5555
pip install scikit-learn==${{ matrix.scikit-learn }}

.github/workflows/ci-lingvo.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ jobs:
4242
with:
4343
python-version: ${{ matrix.python }}
4444
- name: Pre-install Lingvo ASR
45-
# scipy beyond 1.6.0 is not available on Python 3.6, therefore we adapt the installation of requirements.txt
45+
# scipy beyond 1.6.0 is not available on Python 3.6, therefore we adapt the installation of requirements_test.txt
4646
run: |
4747
sudo apt-get update
4848
sudo apt-get -y -q install ffmpeg libavcodec-extra
4949
python -m pip install --upgrade pip setuptools wheel
50-
pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d' requirements.txt)
50+
pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d' requirements_test.txt)
5151
pip install scipy==1.5.4
5252
pip install matplotlib==3.3.4
5353
pip install pandas==1.1.5
@@ -58,6 +58,7 @@ jobs:
5858
pip install lingvo==${{ matrix.lingvo }}
5959
pip install tensorflow-addons==0.9.1
6060
pip install model-pruning-google-research==0.0.3
61+
pip install jax[cpu]==0.2.17
6162
pip list
6263
- name: Run ${{ matrix.name }} Tests
6364
run: ./run_tests.sh ${{ matrix.framework }}

.github/workflows/ci-mxnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
python -m pip install --upgrade pip setuptools wheel
4545
pip install tensorflow==2.4.1
4646
pip install keras==2.4.3
47-
pip3 install -q -r requirements.txt
47+
pip3 install -q -r requirements_test.txt
4848
pip list
4949
- name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
5050
run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}

.github/workflows/ci-pytorch-object-detectors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
sudo apt-get update
3737
sudo apt-get -y -q install ffmpeg libavcodec-extra
3838
python -m pip install --upgrade pip setuptools wheel
39-
pip3 install -q -r requirements.txt
39+
pip3 install -q -r requirements_test.txt
4040
pip list
4141
- name: Pre-install torch
4242
run: |

.github/workflows/ci-pytorch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
sudo apt-get update
5858
sudo apt-get -y -q install ffmpeg libavcodec-extra
5959
python -m pip install --upgrade pip setuptools wheel
60-
pip3 install -r requirements.txt
60+
pip3 install -r requirements_test.txt
6161
pip install tensorflow==2.4.3
6262
pip install keras==2.4.3
6363
pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html

.github/workflows/ci-scikit-learn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
sudo apt-get update
5656
sudo apt-get -y -q install ffmpeg libavcodec-extra
5757
python -m pip install --upgrade pip setuptools wheel
58-
pip install -r requirements.txt
58+
pip install -r requirements_test.txt
5959
pip install tensorflow==2.4.3
6060
pip install keras==2.4.3
6161
pip install scikit-learn==${{ matrix.scikit-learn }}

0 commit comments

Comments
 (0)