diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b2bfceb..0000000 --- a/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG BASE_CONTAINER=nvcr.io/nvidia/pytorch:23.06-py3 -FROM $BASE_CONTAINER as builder - -# Update pip -RUN pip install --upgrade pip - -# CI image -FROM builder as ci -RUN pip install "black==22.10.0" "interrogate==1.5.0" "coverage==6.5.0" -COPY . /modulus-launch/ -RUN cd /modulus-launch/ && pip install -e . && rm -rf /modulus-launch/ - -# Deploy image -FROM builder as deploy -COPY . /modulus-launch/ -RUN cd /modulus-launch/ && pip install . - -# Clean up -RUN rm -rf /modulus-launch/ - -# Docs image -FROM deploy as docs -# Install CI packages -RUN pip install "tensorflow>=2.9.0" "warp-lang>=0.6.0" "black==22.10.0" "interrogate==1.5.0" "coverage==6.5.0" "protobuf==3.20.0" -# Install packages for Sphinx build -RUN pip install "recommonmark==0.7.1" "sphinx==5.1.1" "sphinx-rtd-theme==1.0.0" "pydocstyle==6.1.1" "nbsphinx==0.8.9" "nbconvert==6.4.3" "jinja2==3.0.3" -RUN wget https://github.com/jgm/pandoc/releases/download/3.1.6.2/pandoc-3.1.6.2-1-amd64.deb && dpkg -i pandoc-3.1.6.2-1-amd64.deb diff --git a/README.md b/README.md index ee2ba2f..ecc8895 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # Modulus Launch (Beta) -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +[![Project Status: Moved](https://www.repostatus.org/badges/latest/moved.svg)](https://www.repostatus.org/#moved) [![GitHub](https://img.shields.io/github/license/NVIDIA/modulus-launch)](https://github.com/NVIDIA/modulus-launch/blob/master/LICENSE.txt) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) + +## :rotating_light: This repo has been upstreamed to [Modulus](https://github.com/NVIDIA/modulus) repository Modulus Launch is a PyTorch based deep-learning collection of training recipes and tools @@ -20,56 +22,11 @@ Additional information can be found in the [Modulus documentation](https://docs. ## Installation -### PyPi - -The recommended method for installing the latest version of Modulus Launch is using PyPi: - -```bash -pip install nvidia-modulus.launch -``` - -### NVCR Container - -The recommended Modulus docker image can be pulled from the [NVIDIA Container Registry](https://catalog.ngc.nvidia.com/orgs/nvidia/teams/modulus/containers/modulus): - -```bash -docker pull nvcr.io/nvidia/modulus/modulus:23.09 -``` - -## From Source - -### Package - -For a local build of the Modulus Launch Python package from source use: - -```bash -git clone git@github.com:NVIDIA/modulus-launch.git && cd modulus-launch - -pip install --upgrade pip -pip install . -``` - -### Source Container - -To build Modulus Launch docker image: - -```bash -docker build -t modulus-launch:deploy --target deploy -f Dockerfile . -``` - -To build CI image: - -```bash -docker build -t modulus-launch:ci --target ci -f Dockerfile . -``` - -To build any of these images on top of the Modulus base image, you can -`--build-arg BASE_CONTAINER=modulus:deploy` to the above commands as shown below: - -```bash -docker build --build-arg BASE_CONTAINER=modulus:deploy \ - -t modulus-launch:deploy --target deploy -f Dockerfile . -``` +The PyPi wheel and Dockerfile for this project is being deprecated. The changes +are upstreamed to the main [Modulus](https://github.com/NVIDIA/modulus) repository. +Please refer the [Modulus](https://github.com/NVIDIA/modulus) repository and +[Getting Started Guide](https://docs.nvidia.com/deeplearning/modulus/getting-started/index.html) +for installation instructions. ## Contributing diff --git a/modulus/launch/__init__.py b/modulus/launch/__init__.py index 34f0957..12ab36b 100644 --- a/modulus/launch/__init__.py +++ b/modulus/launch/__init__.py @@ -12,4 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.4.0a0" +__version__ = "0.3.1" + +import warnings + +warnings.warn( + "You are using a deprecated version of modulus launch. To get the latest version, please run `pip install nvidia-modulus[launch]`", + FutureWarning, +) diff --git a/pyproject.toml b/pyproject.toml index 108c243..aef5b4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ readme = "README.md" requires-python = ">=3.8" license = {text = "Apache 2.0"} dependencies = [ - "nvidia-modulus>=0.2.1", + "nvidia-modulus==0.3.0", "hydra-core>=1.2.0", "termcolor>=2.1.1", "wandb>=0.13.7",