Skip to content

Commit

Permalink
Merge branch 'deepjavalibrary:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
takanori-ugai authored Dec 12, 2022
2 parents 4df3cbf + bfa0b7d commit 78ddcef
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 29 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/canary_d2l.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: 11
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.x'
- name: Install IJava kernel
run: |
pip3 install jupyter
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/colab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:

jobs:
sync:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python3
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Add colab instruction on notebooks
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/pr_notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
matrix:
group: ["CH1_CH4_DROPOUT", "CH4_MID", "CH4_REST", "CH8_1", "CH8_2", "CH9_1", "CH9_2", "CH10_1", "CH10_2", "CH11", "CH14", "REST"]
Expand All @@ -30,16 +30,17 @@ jobs:
CH14: "word2vec.ipynb approx-training.ipynb word-embedding-dataset.ipynb glove.ipynb subword-embedding.ipynb"
REST: "chapter_convolutional-neural-networks chapter_linear-networks utils"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: 11
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.x'
- name: Install IJava kernel
run: |
pip3 install jupyter
Expand All @@ -52,7 +53,7 @@ jobs:
export MAX_EPOCH=2
bash test_notebook.sh $${{ matrix.group }}
- name: generated Notebook in html
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
if: always()
with:
name: notebook
Expand Down
4 changes: 2 additions & 2 deletions chapter_installation/index.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@
"\n",
"```java\n",
"// Add the maven dependencies\n",
"%maven ai.djl:api:0.19.0\n",
"%maven ai.djl:api:0.20.0\n",
"%maven org.slf4j:slf4j-simple:2.0.1\n",
" \n",
"// See https://github.com/deepjavalibrary/djl/blob/master/mxnet/mxnet-engine/README.md\n",
"// for more MXNet library selection options\n",
"%maven ai.djl.mxnet:mxnet-engine:0.19.0\n",
"%maven ai.djl.mxnet:mxnet-engine:0.20.0\n",
"```\n",
"\n",
"To avoid repeatedly adding maven dependencies and import required packages, we just load a predefined jupyter notebook: \n",
Expand Down
2 changes: 1 addition & 1 deletion chapter_preliminaries/lookup-api.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"\n",
"For more specific instructions on how to use a given function or class, we can click the desired function or go to it directly by scrolling down and searching for it. As an example, let us explore the usage instructions for `NDManager`'s `ones` function which takes a `Shape` as a parameter. \n",
"\n",
"https://javadoc.io/static/ai.djl/api/0.19.0/ai/djl/ndarray/NDManager.html#ones(ai.djl.ndarray.types.Shape)\n"
"https://javadoc.io/static/ai.djl/api/0.20.0/ai/djl/ndarray/NDManager.html#ones(ai.djl.ndarray.types.Shape)\n"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@
"}\n",
"\n",
"for (NDList pair : seqDataIterRandom(mySeq, 2, 5, manager)) {\n",
" System.out.println(\"X:\\n\" + pair.get(0).toDebugString(50, 50, 50, 50));\n",
" System.out.println(\"Y:\\n\" + pair.get(1).toDebugString(50, 50, 50, 50));\n",
" System.out.println(\"X:\\n\" + pair.get(0).toDebugString(50, 50, 50, 50, true));\n",
" System.out.println(\"Y:\\n\" + pair.get(1).toDebugString(50, 50, 50, 50, true));\n",
"}"
]
},
Expand Down Expand Up @@ -555,8 +555,8 @@
"outputs": [],
"source": [
"for (NDList pair : seqDataIterSequential(mySeq, 2, 5, manager)) {\n",
" System.out.println(\"X:\\n\" + pair.get(0).toDebugString(10, 10, 10, 10));\n",
" System.out.println(\"Y:\\n\" + pair.get(1).toDebugString(10, 10, 10, 10));\n",
" System.out.println(\"X:\\n\" + pair.get(0).toDebugString(10, 10, 10, 10, true));\n",
" System.out.println(\"Y:\\n\" + pair.get(1).toDebugString(10, 10, 10, 10, true));\n",
"}"
]
},
Expand Down
2 changes: 1 addition & 1 deletion debug/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configure(this) {
apply from: file("tools/gradle/java-formatter.gradle")
}

def djl_version = "0.19.0"
def djl_version = "0.20.0"

dependencies {
implementation platform("ai.djl:bom:${djl_version}")
Expand Down
2 changes: 1 addition & 1 deletion debug/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ systemProp.org.gradle.internal.http.connectionTimeout=60000
# FIXME: Workaround gradle publish issue: https://github.com/gradle/gradle/issues/11308
systemProp.org.gradle.internal.publish.checksums.insecure=true

log4j_slf4j_version=2.17.2
log4j_slf4j_version=2.19.0
4 changes: 2 additions & 2 deletions homework/solutions/homework1_sol.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"source": [
"%mavenRepo snapshots https://oss.sonatype.org/content/repositories/snapshots/\n",
"\n",
"%maven ai.djl:api:0.19.0\n",
"%maven ai.djl:api:0.20.0\n",
"%maven org.slf4j:slf4j-api:2.0.1\n",
"%maven org.slf4j:slf4j-simple:2.0.1\n",
"\n",
"%maven ai.djl.mxnet:mxnet-engine:0.19.0"
"%maven ai.djl.mxnet:mxnet-engine:0.20.0"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions utils/djl-imports.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"metadata": {},
"outputs": [],
"source": [
"%maven ai.djl:basicdataset:0.19.0\n",
"%maven ai.djl.mxnet:mxnet-engine:0.19.0\n",
"%maven org.slf4j:slf4j-simple:2.0.1"
"%maven ai.djl:basicdataset:0.20.0\n",
"%maven ai.djl.mxnet:mxnet-engine:0.20.0\n",
"%maven org.slf4j:slf4j-simple:1.7.36"
]
},
{
Expand Down

0 comments on commit 78ddcef

Please sign in to comment.