Skip to content

Commit 2a5bb21

Browse files
authored
Merge branch 'keras-team:master' into master
2 parents 2b65f89 + 94ca6ef commit 2a5bb21

Some content is hidden

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

58 files changed

+2188
-888
lines changed

.github/workflows/actions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
PYTHON: ${{ matrix.python-version }}
3232
KERAS_HOME: .github/workflows/config/${{ matrix.backend }}
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- name: Check for changes in keras/src/applications
3636
uses: dorny/paths-filter@v3
3737
id: filter
@@ -40,7 +40,7 @@ jobs:
4040
applications:
4141
- 'keras/src/applications/**'
4242
- name: Set up Python
43-
uses: actions/setup-python@v5
43+
uses: actions/setup-python@v6
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646
- name: Get pip cache dir
@@ -126,9 +126,9 @@ jobs:
126126
name: Check the code format
127127
runs-on: ubuntu-latest
128128
steps:
129-
- uses: actions/checkout@v4
129+
- uses: actions/checkout@v5
130130
- name: Set up Python 3.10
131-
uses: actions/setup-python@v5
131+
uses: actions/setup-python@v6
132132
with:
133133
python-version: '3.10'
134134
- name: Get pip cache dir

.github/workflows/auto-assignment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
welcome:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/github-script@v7
16+
- uses: actions/checkout@v5
17+
- uses: actions/github-script@v8
1818
with:
1919
script: |
2020
const script = require('./\.github/workflows/scripts/auto-assignment.js')

.github/workflows/labeler.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
welcome:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v4
38-
- uses: actions/github-script@v7
37+
- uses: actions/checkout@v5
38+
- uses: actions/github-script@v8
3939
with:
4040
script: |
4141
const script = require('./\.github/workflows/scripts/labeler.js')

.github/workflows/nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
PYTHON: ${{ matrix.python-version }}
2222
KERAS_BACKEND: ${{ matrix.backend }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Set up Python
26-
uses: actions/setup-python@v5
26+
uses: actions/setup-python@v6
2727
with:
2828
python-version: ${{ matrix.python-version }}
2929
- name: Get pip cache dir
@@ -61,9 +61,9 @@ jobs:
6161
name: Check the code format
6262
runs-on: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6565
- name: Set up Python 3.10
66-
uses: actions/setup-python@v5
66+
uses: actions/setup-python@v6
6767
with:
6868
python-version: '3.10'
6969
- name: Get pip cache dir
@@ -90,9 +90,9 @@ jobs:
9090
needs: [build, format]
9191
runs-on: ubuntu-latest
9292
steps:
93-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v5
9494
- name: Set up Python
95-
uses: actions/setup-python@v5
95+
uses: actions/setup-python@v6
9696
with:
9797
python-version: '3.10'
9898
- name: Install dependencies

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525

2626
steps:
2727
- name: "Checkout code"
28-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
28+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.1
2929
with:
3030
persist-credentials: false
3131

3232
- name: "Run analysis"
33-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
33+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3434
with:
3535
results_file: results.sarif
3636
results_format: sarif
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: "Upload to code-scanning"
59-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
59+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
6060
with:
6161
sarif_file: results.sarif

.github/workflows/stale-issue-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
actions: write
1414
steps:
1515
- name: Awaiting response issues
16-
uses: actions/stale@v9
16+
uses: actions/stale@v10
1717
with:
1818
operations-per-run: 500
1919
days-before-issue-stale: 14
@@ -36,7 +36,7 @@ jobs:
3636
close-pr-message: "This PR was closed because it has been inactive for 28 days. Please reopen if you'd like to work on this further."
3737
repo-token: ${{ secrets.GITHUB_TOKEN }}
3838
- name: Contribution issues
39-
uses: actions/stale@v9
39+
uses: actions/stale@v10
4040
with:
4141
operations-per-run: 500
4242
days-before-issue-stale: 180

guides/writing_your_own_callbacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def on_train_begin(self, logs=None):
333333
# The epoch the training stops at.
334334
self.stopped_epoch = 0
335335
# Initialize the best as infinity.
336-
self.best = np.Inf
336+
self.best = np.inf
337337

338338
def on_epoch_end(self, epoch, logs=None):
339339
current = logs.get("loss")

keras/api/_tf_keras/keras/ops/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
from keras.src.ops.numpy import log2 as log2
220220
from keras.src.ops.numpy import log10 as log10
221221
from keras.src.ops.numpy import logaddexp as logaddexp
222+
from keras.src.ops.numpy import logaddexp2 as logaddexp2
222223
from keras.src.ops.numpy import logical_and as logical_and
223224
from keras.src.ops.numpy import logical_not as logical_not
224225
from keras.src.ops.numpy import logical_or as logical_or

keras/api/_tf_keras/keras/ops/numpy/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
from keras.src.ops.numpy import log2 as log2
108108
from keras.src.ops.numpy import log10 as log10
109109
from keras.src.ops.numpy import logaddexp as logaddexp
110+
from keras.src.ops.numpy import logaddexp2 as logaddexp2
110111
from keras.src.ops.numpy import logical_and as logical_and
111112
from keras.src.ops.numpy import logical_not as logical_not
112113
from keras.src.ops.numpy import logical_or as logical_or

keras/api/ops/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
from keras.src.ops.numpy import log2 as log2
220220
from keras.src.ops.numpy import log10 as log10
221221
from keras.src.ops.numpy import logaddexp as logaddexp
222+
from keras.src.ops.numpy import logaddexp2 as logaddexp2
222223
from keras.src.ops.numpy import logical_and as logical_and
223224
from keras.src.ops.numpy import logical_not as logical_not
224225
from keras.src.ops.numpy import logical_or as logical_or

0 commit comments

Comments
 (0)