Skip to content

Commit

Permalink
docker: update nodjs to latest install instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
mloubout committed Nov 2, 2023
1 parent 306e975 commit fb2170d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion devito/passes/iet/parpragma.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,8 @@ def __init__(self, sregistry, options, platform, compiler):
super().__init__(sregistry, options, platform, compiler)

self.gpu_fit = options['gpu-fit']
self.par_tile = UnboundTuple(*options['par-tile'])
self.par_tile = UnboundTuple(*options['par-tile'],
default=options['par-tile'].default)
self.par_disabled = options['par-disabled']

def _score_candidate(self, n0, root, collapsable=()):
Expand Down
3 changes: 2 additions & 1 deletion devito/tools/data_structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,12 +670,13 @@ def __new__(cls, *items, **kwargs):
obj = super().__new__(cls, tuple(nitems))
obj.last = len(nitems)
obj.current = 0
obj._default = kwargs.get('default', nitems[0])

return obj

@property
def default(self):
return self[0]
return self._default

@property
def prod(self):
Expand Down
13 changes: 6 additions & 7 deletions docker/Dockerfile.nvidia
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ ENV DEBIAN_FRONTEND noninteractive

# Install python
RUN apt-get update && \
apt-get install -y dh-autoreconf python3-venv python3-dev python3-pip

RUN apt-get update -y && \
apt-get install -y -q gpg apt-utils curl wget vim libnuma-dev tmux numactl

apt-get install -y -q gpg apt-utils curl wget vim libnuma-dev tmux numactl \
dh-autoreconf python3-venv python3-dev python3-pip

# nodesource: nvdashboard requires nodejs>=10
RUN curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | gpg --yes --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
Expand All @@ -40,8 +37,10 @@ RUN if [ "$ver" = "nvhpc" ]; then \
apt-get install --allow-unauthenticated -y -q ./nvhpc_${year}.${minor}_amd64.deb; \
fi;

RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y -q \
# Nodejs https://github.com/nodesource/distributions
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
RUN apt-get update && apt-get install -y -q \
liblapack-dev libblas-dev \
libibverbs-dev libmlx4-1 libmlx5-1 ibutils \
# Devito Jupyter Notebooks and Ux experience
Expand Down

0 comments on commit fb2170d

Please sign in to comment.