Skip to content

Commit 9c437be

Browse files
beat-buesserbeat-buesser
authored
Merge pull request #2613 from Trusted-AI/dependabot/pip/keras-3.10.0
Bump keras from 2.14.0 to 3.10.0
2 parents 0a32d12 + d4d2f64 commit 9c437be

File tree

137 files changed

+2576
-7553
lines changed

Some content is hidden

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

137 files changed

+2576
-7553
lines changed

‎.github/workflows/ci-deepspeech-v3.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,48 @@ jobs:
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
32+
33+
- name: Cache CIFAR-10 dataset
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.art/data/cifar-10-batches-py
37+
key: cifar10-dataset-cache-v1
38+
39+
- name: Cache MNIST dataset
40+
uses: actions/cache@v3
41+
with:
42+
path: ~/.art/data/mnist.npz
43+
key: mnist-dataset-cache-v1
44+
45+
- name: Download and extract CIFAR-10 if not cached
46+
run: |
47+
mkdir -p ~/.art/data
48+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
49+
echo "Downloading CIFAR-10 dataset..."
50+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
51+
echo "Downloaded from www.cs.toronto.edu"
52+
else
53+
echo "Primary download failed, trying Dropbox mirror..."
54+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
55+
fi
56+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
57+
else
58+
echo "CIFAR-10 already cached."
59+
fi
60+
61+
- name: Download MNIST if not cached
62+
run: |
63+
mkdir -p ~/.art/data
64+
if [ ! -f ~/.art/data/mnist.npz ]; then
65+
echo "Downloading MNIST dataset..."
66+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
67+
else
68+
echo "MNIST already cached."
69+
fi
70+
3271
- name: Run Test Action
3372
uses: ./.github/actions/deepspeech-v3
73+
3474
- name: Upload coverage to Codecov
3575
uses: codecov/codecov-action@v5
3676
with:

‎.github/workflows/ci-espresso.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,48 @@ jobs:
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
32+
33+
- name: Cache CIFAR-10 dataset
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.art/data/cifar-10-batches-py
37+
key: cifar10-dataset-cache-v1
38+
39+
- name: Cache MNIST dataset
40+
uses: actions/cache@v3
41+
with:
42+
path: ~/.art/data/mnist.npz
43+
key: mnist-dataset-cache-v1
44+
45+
- name: Download and extract CIFAR-10 if not cached
46+
run: |
47+
mkdir -p ~/.art/data
48+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
49+
echo "Downloading CIFAR-10 dataset..."
50+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
51+
echo "Downloaded from www.cs.toronto.edu"
52+
else
53+
echo "Primary download failed, trying Dropbox mirror..."
54+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
55+
fi
56+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
57+
else
58+
echo "CIFAR-10 already cached."
59+
fi
60+
61+
- name: Download MNIST if not cached
62+
run: |
63+
mkdir -p ~/.art/data
64+
if [ ! -f ~/.art/data/mnist.npz ]; then
65+
echo "Downloading MNIST dataset..."
66+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
67+
else
68+
echo "MNIST already cached."
69+
fi
70+
3271
- name: Run Test Action
3372
uses: ./.github/actions/espresso
73+
3474
- name: Upload coverage to Codecov
3575
uses: codecov/codecov-action@v5
3676
with:

‎.github/workflows/ci-goturn.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,48 @@ jobs:
2929
steps:
3030
- name: Checkout Repo
3131
uses: actions/checkout@v4
32+
33+
- name: Cache CIFAR-10 dataset
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.art/data/cifar-10-batches-py
37+
key: cifar10-dataset-cache-v1
38+
39+
- name: Cache MNIST dataset
40+
uses: actions/cache@v3
41+
with:
42+
path: ~/.art/data/mnist.npz
43+
key: mnist-dataset-cache-v1
44+
45+
- name: Download and extract CIFAR-10 if not cached
46+
run: |
47+
mkdir -p ~/.art/data
48+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
49+
echo "Downloading CIFAR-10 dataset..."
50+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
51+
echo "Downloaded from www.cs.toronto.edu"
52+
else
53+
echo "Primary download failed, trying Dropbox mirror..."
54+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
55+
fi
56+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
57+
else
58+
echo "CIFAR-10 already cached."
59+
fi
60+
61+
- name: Download MNIST if not cached
62+
run: |
63+
mkdir -p ~/.art/data
64+
if [ ! -f ~/.art/data/mnist.npz ]; then
65+
echo "Downloading MNIST dataset..."
66+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
67+
else
68+
echo "MNIST already cached."
69+
fi
70+
3271
- name: Run Test Action
3372
uses: ./.github/actions/goturn
73+
3474
- name: Upload coverage to Codecov
3575
uses: codecov/codecov-action@v5
3676
env:

‎.github/workflows/ci-huggingface.yml‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,67 @@ jobs:
4040
steps:
4141
- name: Checkout Repo
4242
uses: actions/checkout@v4
43+
4344
- name: Setup Python
4445
uses: actions/setup-python@v5
4546
with:
4647
python-version: ${{ matrix.python }}
48+
4749
- name: Install Dependencies
4850
run: |
4951
sudo apt-get update
5052
sudo apt-get -y -q install ffmpeg libavcodec-extra
5153
python -m pip install --upgrade pip setuptools wheel
52-
pip3 install -r requirements_test.txt
53-
pip install tensorflow==2.14.0
54-
pip install keras==2.14.0
54+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^torch/d;/^torchvision/d;/^torchaudio/d;/^transformers/d' requirements_test.txt)
55+
pip install tensorflow==2.18.1
56+
pip install keras==3.10.0
5557
pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
5658
pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
5759
pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
5860
pip install transformers==${{ matrix.transformers }}
5961
pip list
62+
63+
- name: Cache CIFAR-10 dataset
64+
uses: actions/cache@v3
65+
with:
66+
path: ~/.art/data/cifar-10-batches-py
67+
key: cifar10-dataset-cache-v1
68+
69+
- name: Cache MNIST dataset
70+
uses: actions/cache@v3
71+
with:
72+
path: ~/.art/data/mnist.npz
73+
key: mnist-dataset-cache-v1
74+
75+
- name: Download and extract CIFAR-10 if not cached
76+
run: |
77+
mkdir -p ~/.art/data
78+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
79+
echo "Downloading CIFAR-10 dataset..."
80+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
81+
echo "Downloaded from www.cs.toronto.edu"
82+
else
83+
echo "Primary download failed, trying Dropbox mirror..."
84+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
85+
fi
86+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
87+
else
88+
echo "CIFAR-10 already cached."
89+
fi
90+
91+
- name: Download MNIST if not cached
92+
run: |
93+
mkdir -p ~/.art/data
94+
if [ ! -f ~/.art/data/mnist.npz ]; then
95+
echo "Downloading MNIST dataset..."
96+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
97+
else
98+
echo "MNIST already cached."
99+
fi
100+
60101
- name: Run Tests
61102
run: ./run_tests.sh ${{ matrix.framework }}
103+
62104
- name: Upload coverage to Codecov
63105
uses: codecov/codecov-action@v5
64106
with:

‎.github/workflows/ci-keras.yml‎

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,73 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: Keras 2.13.1 (TensorFlow 2.13.1 Python 3.10)
32-
framework: keras
33-
python: '3.10'
34-
tensorflow: 2.13.1
35-
keras: 2.13.1
36-
tf_addons: 0.19.0
37-
- name: Keras 2.14.0 (TensorFlow 2.14.0 Python 3.10)
38-
framework: keras
39-
python: '3.10'
40-
tensorflow: 2.14.0
41-
keras: 2.14.0
42-
tf_addons: 0.20.0
43-
- name: TensorFlow-Keras 2.14.0 (Keras 2.14.0 Python 3.10)
31+
- name: TensorFlow-Keras 2.18.1 (Keras 3.10.0 Python 3.10)
4432
framework: kerastf
4533
python: '3.10'
46-
tensorflow: 2.14.0
47-
keras: 2.14.0
48-
tf_addons: 0.20.0
34+
tensorflow: 2.18.1
35+
keras: 3.10.0
4936

5037
name: ${{ matrix.name }}
5138
steps:
5239
- name: Checkout Repo
5340
uses: actions/checkout@v4
41+
5442
- name: Setup Python
5543
uses: actions/setup-python@v5
5644
with:
5745
python-version: ${{ matrix.python }}
46+
5847
- name: Install Dependencies
5948
run: |
6049
sudo apt-get update
6150
sudo apt-get -y -q install ffmpeg libavcodec-extra
6251
python -m pip install --upgrade pip setuptools wheel
63-
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^tensorflow-addons/d' requirements_test.txt)
52+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d' requirements_test.txt)
6453
pip install tensorflow==${{ matrix.tensorflow }}
6554
pip install keras==${{ matrix.keras }}
66-
pip install tensorflow-addons==${{ matrix.tf_addons }}
6755
pip list
56+
57+
- name: Cache CIFAR-10 dataset
58+
uses: actions/cache@v3
59+
with:
60+
path: ~/.art/data/cifar-10-batches-py
61+
key: cifar10-dataset-cache-v1
62+
63+
- name: Cache MNIST dataset
64+
uses: actions/cache@v3
65+
with:
66+
path: ~/.art/data/mnist.npz
67+
key: mnist-dataset-cache-v1
68+
69+
- name: Download and extract CIFAR-10 if not cached
70+
run: |
71+
mkdir -p ~/.art/data
72+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
73+
echo "Downloading CIFAR-10 dataset..."
74+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
75+
echo "Downloaded from www.cs.toronto.edu"
76+
else
77+
echo "Primary download failed, trying Dropbox mirror..."
78+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
79+
fi
80+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
81+
else
82+
echo "CIFAR-10 already cached."
83+
fi
84+
85+
- name: Download MNIST if not cached
86+
run: |
87+
mkdir -p ~/.art/data
88+
if [ ! -f ~/.art/data/mnist.npz ]; then
89+
echo "Downloading MNIST dataset..."
90+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
91+
else
92+
echo "MNIST already cached."
93+
fi
94+
6895
- name: Run Tests
6996
run: ./run_tests.sh ${{ matrix.framework }}
97+
7098
- name: Upload coverage to Codecov
7199
uses: codecov/codecov-action@v5
72100
with:

‎.github/workflows/ci-legacy.yml‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,81 @@ jobs:
2929
matrix:
3030
module: [attacks_1, attacks_2, estimators, defences, metrics, art]
3131
include:
32-
- name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.6.1 Python 3.9)
32+
- name: legacy (TensorFlow 2.18.1 Keras 3.10.0 PyTorch 2.7.0 scikit-learn 1.6.1 Python 3.10)
3333
framework: legacy
3434
python: '3.10'
35-
tensorflow: 2.14.0
36-
keras: 2.14.0
37-
torch: 1.13.1+cpu
38-
torchvision: 0.14.1+cpu
39-
torchaudio: 0.13.1+cpu
35+
tensorflow: 2.18.1
36+
keras: 3.10.0
37+
torch: 2.7.0
38+
torchvision: 0.22.0
39+
torchaudio: 2.7.0
4040
scikit-learn: 1.6.1
4141

4242
name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
4343
steps:
4444
- name: Checkout Repo
4545
uses: actions/checkout@v4
46+
4647
- name: Setup Python
4748
uses: actions/setup-python@v5
4849
with:
4950
python-version: ${{ matrix.python }}
51+
5052
- name: Install Dependencies
5153
run: |
5254
sudo apt-get update
5355
sudo apt-get -y -q install ffmpeg libavcodec-extra
5456
python -m pip install --upgrade pip setuptools wheel
55-
pip install -q -r requirements_test.txt
57+
pip install -q -r <(sed '/^tensorflow/d;/^keras/d;/^torch/d;/^torchvision/d;/^torchaudio/d' requirements_test.txt)
5658
pip install tensorflow==${{ matrix.tensorflow }}
5759
pip install keras==${{ matrix.keras }}
5860
pip install scikit-learn==${{ matrix.scikit-learn }}
5961
pip install torch==${{ matrix.torch }} --index-url https://download.pytorch.org/whl/cpu
6062
pip install torchvision==${{ matrix.torchvision }} --index-url https://download.pytorch.org/whl/cpu
6163
pip install torchaudio==${{ matrix.torchaudio }} --index-url https://download.pytorch.org/whl/cpu
6264
pip list
65+
66+
- name: Cache CIFAR-10 dataset
67+
uses: actions/cache@v3
68+
with:
69+
path: ~/.art/data/cifar-10-batches-py
70+
key: cifar10-dataset-cache-v1
71+
72+
- name: Cache MNIST dataset
73+
uses: actions/cache@v3
74+
with:
75+
path: ~/.art/data/mnist.npz
76+
key: mnist-dataset-cache-v1
77+
78+
- name: Download and extract CIFAR-10 if not cached
79+
run: |
80+
mkdir -p ~/.art/data
81+
if [ ! -d ~/.art/data/cifar-10-batches-py ]; then
82+
echo "Downloading CIFAR-10 dataset..."
83+
if curl -L -f -o cifar-10-python.tar.gz https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz; then
84+
echo "Downloaded from www.cs.toronto.edu"
85+
else
86+
echo "Primary download failed, trying Dropbox mirror..."
87+
curl -L -o cifar-10-python.tar.gz "https://www.dropbox.com/scl/fi/6mhiq4rtfszqrosasp8a9/cifar-10-batches-py.tar.gz?rlkey=g6v114un4je233j52tu5tdsbe&st=gxo2e50q&dl=1"
88+
fi
89+
tar -xzf cifar-10-python.tar.gz -C ~/.art/data/
90+
else
91+
echo "CIFAR-10 already cached."
92+
fi
93+
94+
- name: Download MNIST if not cached
95+
run: |
96+
mkdir -p ~/.art/data
97+
if [ ! -f ~/.art/data/mnist.npz ]; then
98+
echo "Downloading MNIST dataset..."
99+
curl -L -o ~/.art/data/mnist.npz https://s3.amazonaws.com/img-datasets/mnist.npz
100+
else
101+
echo "MNIST already cached."
102+
fi
103+
63104
- name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
64105
run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}
106+
65107
- name: Upload coverage to Codecov
66108
uses: codecov/codecov-action@v5
67109
with:

0 commit comments

Comments
 (0)