Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/fixes #208

Merged
merged 3 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ COMMAND = /usr/bin/zsh --login
# which may cause issues if multiple users are using the same account.
# Specify `PROJECT` for the `make` command if this is the case.
_PROJECT = "${SERVICE}-${USR}"
_TIMESTAMP = $(shell date +"%Y%m%d-%H%M%S")
# The `COMPOSE_PROJECT_NAME` variable must be lowercase.
PROJECT = $(shell echo ${_PROJECT} | tr "[:upper:]" "[:lower:]")-`date +"%Y%m%d-%H%M%S"`
PROJECT = $(shell echo ${_PROJECT} | tr "[:upper:]" "[:lower:]")-${_TIMESTAMP}
PROJECT_ROOT = /opt/project

# Creates a `.env` file in ${PWD} if it does not exist.
Expand All @@ -34,7 +35,7 @@ USR = $(shell id -un)

REPOSITORY = cresset
TAG = "${SERVICE}-${USR}"
_IMAGE_NAME = "${REPOSITORY}:${TAG}"
_IMAGE_NAME = "${REPOSITORY}:${TAG}-${_TIMESTAMP}"
# Image names are made lowercase even though Docker can
# recognize uppercase for cross-platform compatibility.
IMAGE_NAME = $(shell echo ${_IMAGE_NAME} | tr "[:upper:]" "[:lower:]")
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ services:
# Fails if `BUILD_MODE=include` but `CCC` is not set explicitly.
TORCH_CUDA_ARCH_LIST: ${CCC} # Ignore the missing CCC warning otherwise.
# Variables for building PyTorch. Must be valid git tags or commits.
PYTORCH_VERSION_TAG: ${PYTORCH_VERSION_TAG:-v2.3.1}
TORCHVISION_VERSION_TAG: ${TORCHVISION_VERSION_TAG:-v0.18.1}
PYTORCH_VERSION_TAG: ${PYTORCH_VERSION_TAG:-v2.4.0}
TORCHVISION_VERSION_TAG: ${TORCHVISION_VERSION_TAG:-v0.19.0}
# Variables for downloading PyTorch instead of building.
PYTORCH_INDEX_URL: ${PYTORCH_INDEX_URL:-https://download.pytorch.org/whl/cu121}
# Set `PYTORCH_FETCH_NIGHTLY` to any value to fetch the nightly binaries.
# Also remember to change the index url to the nightly version.
PYTORCH_FETCH_NIGHTLY: ${PYTORCH_FETCH_NIGHTLY:+--pre}
PYTORCH_VERSION: ${PYTORCH_VERSION:-2.3.1}
TORCHVISION_VERSION: ${TORCHVISION_VERSION:-0.18.1}
PYTORCH_VERSION: ${PYTORCH_VERSION:-2.4.0}
TORCHVISION_VERSION: ${TORCHVISION_VERSION:-0.19.0}
# URLs for faster `apt` and `pip` installs.
# Use URLs optimized for location and security requirements.
# DEB_OLD: ${DEB_OLD:-http://archive.ubuntu.com}
Expand All @@ -167,7 +167,7 @@ services:
dockerfile: dockerfiles/ngc.Dockerfile
args:
NGC_YEAR: ${NGC_YEAR:-24}
NGC_MONTH: ${NGC_MONTH:-06}
NGC_MONTH: ${NGC_MONTH:-07}

simple: # Service installed purely from official/verified Docker images and `conda`.
extends:
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/ngc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ FROM train-base AS train-adduser-include

ARG GID
ARG UID
ARG GRP=user
ARG USR=user
ARG GRP
ARG USR
ARG PASSWD=ubuntu
# Create user with password-free `sudo` permissions.
RUN groupadd -f -g ${GID} ${GRP} && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/simple.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ FROM train-base AS train-adduser-include

ARG GID
ARG UID
ARG GRP=user
ARG USR=user
ARG GRP
ARG USR
ARG PASSWD=ubuntu
# The `zsh` shell is used due to its convenience and popularity.
# Creating user with password-free sudo permissions.
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/train.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ FROM train-base AS train-adduser-include
# A new `sudo` user is created to help prevent file ownership issues and accidents.
ARG GID
ARG UID
ARG GRP=user
ARG USR=user
ARG GRP
ARG USR
ARG PASSWD=ubuntu
# The `zsh` shell is used due to its convenience and popularity.
# Creating user with password-free sudo permissions.
Expand Down
2 changes: 1 addition & 1 deletion reqs/simple-environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies: # Use conda packages if possible.
- python==3.12
- pytorch::pytorch # Only install PyTorch-related packages from the PyTorch channel.
- pytorch::torchvision
- pytorch::pytorch-cuda==12.1
- pytorch::pytorch-cuda==12.4
- jemalloc
- mkl
- numpy
Expand Down