Skip to content

Commit

Permalink
Merge the Julia Notebook bump to 1.10 and the addition of the SpeedyW…
Browse files Browse the repository at this point in the history
…eather package
  • Loading branch information
rasmunk committed Jan 17, 2024
1 parent 735f9db commit 70a4355
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
6 changes: 3 additions & 3 deletions architecture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,6 @@ architecture:
tag: latest
pipeline_dependent: true
parameters:
JULIA_MAJOR_VERSION: 1.9
JULIA_MINOR_VERSION: 4
JULIA_DOWNLOAD_MD5: 3503c6bc79c48b4e13178155ebe9cae5
JULIA_MAJOR_VERSION: "1.10"
JULIA_MINOR_VERSION: "0"
JULIA_DOWNLOAD_MD5: c16f16304cac9af1501ae71c02cb4d1e
1 change: 1 addition & 0 deletions base-notebook/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ RUN apt-get update \
g++ \
gcc \
gfortran \
gdb \
git \
htop \
less \
Expand Down
5 changes: 3 additions & 2 deletions julia-notebook/packages.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ using Pkg
dependencies = [
"Oscar",
"HomotopyContinuation",
"DifferentialEquations"
"DifferentialEquations",
"SpeedyWeather"
]

Pkg.add(dependencies)
Pkg.add(dependencies)
4 changes: 2 additions & 2 deletions julia-notebook/tests/test_notebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

cur_path = os.path.abspath(".")
notebooks_path = os.path.join(cur_path, "notebooks")
kernels = ["julia-1.9"]
kernels = ["julia-1.10"]


def _notebook_run(path, kernel="julia-1.9", timeout=300):
def _notebook_run(path, kernel="julia-1.10", timeout=300):
"""Execute a notebook via nbconvert and collect output.
:returns (parsed nb object, execution errors)
"""
Expand Down
10 changes: 5 additions & 5 deletions r-notebook/res/keras_package.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ## CRAN packages
# install.packages(c(
# "keras"), repos="http://mirrors.dotsrc.org/cran/")

# library(keras)
# install_keras(method='conda', tensorflow="default")
# CRAN packages
install.packages(c("keras"), repos="http://mirrors.dotsrc.org/cran/")

library(keras)
install_keras(method='conda', version='2.13.0')

0 comments on commit 70a4355

Please sign in to comment.