From aef8d97bb1110d561b38ff1c02f60231f4b1dcf8 Mon Sep 17 00:00:00 2001 From: Mannat Singh Date: Mon, 20 Mar 2023 08:48:57 -0700 Subject: [PATCH] Update requirements and README (#801) Summary: Pull Request resolved: https://github.com/facebookresearch/ClassyVision/pull/801 Reviewed By: QuentinDuval Differential Revision: D44156956 Pulled By: mannatsingh fbshipit-source-id: a32399a4dc8f798a4ef4696112b28660ed657c8b --- .circleci/config.yml | 253 -------------------------------------- README.md | 4 + classy_vision/__init__.py | 2 +- requirements.txt | 2 - 4 files changed, 5 insertions(+), 256 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index aaa29f0ed..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,253 +0,0 @@ -# Python CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-python/ for more details -# -version: 2 - -# ------------------------------------------------------------------------------------- -# Environments to run the jobs in -# ------------------------------------------------------------------------------------- -cpu: &cpu - environment: - TERM: xterm - machine: - image: default - resource_class: medium - -gpu: &gpu - environment: - CUDA_VERSION: "10.2" - TERM: xterm - machine: - image: ubuntu-1604:202104-01 - resource_class: gpu.nvidia.small.multi # NVIDIA Tesla T4 2 GPU 4 vCPUs 15 GB RAM (2 GPUs) - -# ------------------------------------------------------------------------------------- -# Re-usable commands -# ------------------------------------------------------------------------------------- -setup_venv: &setup_venv - - run: - name: Activate Venv - command: | - python -m venv ~/venv - echo ". ~/venv/bin/activate" >> $BASH_ENV - . ~/venv/bin/activate - python --version - which python - which pip - -install_python: &install_python - - run: - name: Install Python - working_directory: ~/ - command: | - pyenv install 3.6.2 - pyenv global 3.6.2 - which python - which pip - -upgrade_pip_setuptools: &upgrade_pip_setuptools - - run: - name: Upgrade pip and setuptools - working_directory: ~/ - command: | - pip install --upgrade pip - pip install --upgrade --progress-bar off setuptools - -install_dep: &install_dep - - run: - name: Install Dependencies - command: | - pip install --progress-bar off -r requirements.txt - pip list - -setup_cuda: &setup_cuda - - run: - name: Setup CUDA - working_directory: ~/ - command: | - # download and install nvidia drivers, cuda, etc - wget --quiet --no-clobber -P ~/nvidia-downloads 'https://pytorch-ci-utils.s3.us-east-2.amazonaws.com/nvidia-drivers/NVIDIA-Linux-x86_64-440.64.run' - wget --quiet --no-clobber -P ~/nvidia-downloads 'https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-ubuntu1604.pin' - wget --quiet --no-clobber -P ~/nvidia-downloads 'http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda-repo-ubuntu1604-10-2-local-10.2.89-440.33.01_1.0-1_amd64.deb' - sudo cp ~/nvidia-downloads/cuda-ubuntu1604.pin /etc/apt/preferences.d/cuda-repository-pin-600 - time sudo /bin/bash ~/nvidia-downloads/NVIDIA-Linux-x86_64-440.64.run --no-drm -q --ui=none - time sudo dpkg -i ~/nvidia-downloads/cuda-repo-ubuntu1604-10-2-local-10.2.89-440.33.01_1.0-1_amd64.deb - nvidia-smi - -check_cuda_available: &check_cuda_available - - run: - name: Check CUDA Available - command: python -c "import torch; assert torch.cuda.is_available(), 'CUDA not available'" - -install_dep_bc: &install_dep_bc - - run: - name: Install Dependencies for testing backwards compatibility - command: | - which python - which pip - pip install --upgrade pip - pip install --upgrade --progress-bar off setuptools - pip install --progress-bar off -r requirements_test_bc.txt - pip list - -install_dev_dep: &install_dev_dep - - run: - name: Install Dev Dependencies - command: | - pip install .[dev] - -pip_list: &pip_list - - run: - name: Pip list - command: | - pip list - -run_tests: &run_tests - - run: - name: Run Tests - command: | - python setup.py test -s test.suites.unittests -v - -# ------------------------------------------------------------------------------------- -# Jobs to run -# ------------------------------------------------------------------------------------- -jobs: - cpu_tests: - <<: *cpu - - working_directory: ~/ClassyVision - - steps: - - checkout - - - <<: *install_python - - - <<: *setup_venv - - - <<: *upgrade_pip_setuptools - - # Download and cache dependencies - - restore_cache: - keys: - - v9-cpu-dependencies-{{ checksum "requirements.txt" }} - # fallback to using the latest cache if no exact match is found - - v9-cpu-dependencies- - - - <<: *install_dev_dep - - - <<: *install_dep - - - <<: *pip_list - - - save_cache: - paths: - - ~/venv - key: v9-cpu-dependencies-{{ checksum "requirements.txt" }} - - - <<: *run_tests - - - run: - name: Run classy-project tests - command: | - pip install . - classy-project my-project - pushd my-project - ./classy_train.py --config configs/template_config.json - popd - rm -rf my-project - - - run: - name: Check formatting - working_directory: ~/ClassyVision/ - command: | - bash ./scripts/formatter.sh - - - gpu_tests: - <<: *gpu - - working_directory: ~/ClassyVision - - steps: - - checkout - - - <<: *setup_cuda - - - <<: *install_python - - - <<: *setup_venv - - - <<: *upgrade_pip_setuptools - - # Download and cache dependencies - - restore_cache: - keys: - - v6-gpu-dependencies-{{ checksum "requirements.txt" }} - # fallback to using the latest cache if no exact match is found - - v6-gpu-dependencies- - - - <<: *install_dev_dep - - - <<: *install_dep - - - <<: *pip_list - - - <<: *check_cuda_available - - - save_cache: - paths: - - ~/venv - key: v6-gpu-dependencies-{{ checksum "requirements.txt" }} - - - <<: *run_tests - - - gpu_tests_bc: - <<: *gpu - - working_directory: ~/ClassyVision - - steps: - - checkout - - - <<: *setup_cuda - - - <<: *install_python - - - <<: *setup_venv - - - <<: *upgrade_pip_setuptools - - # Download and cache dependencies - - restore_cache: - keys: - - v3-gpu-bc-dependencies-{{ checksum "requirements_test_bc.txt" }} - # fallback to using the latest cache if no exact match is found - - v3-gpu-bc-dependencies- - - - <<: *install_dev_dep - - - <<: *install_dep_bc - - - <<: *pip_list - - - <<: *check_cuda_available - - - save_cache: - paths: - - ~/venv - key: v3-gpu-bc-dependencies-{{ checksum "requirements_test_bc.txt" }} - - - <<: *run_tests - -# ------------------------------------------------------------------------------------- -# Workflows -# ------------------------------------------------------------------------------------- -workflows: - version: 2 - build_and_test: - jobs: - - cpu_tests - - gpu_tests - - gpu_tests_bc diff --git a/README.md b/README.md index 3c1b32d06..2e4dabb2e 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@

+## Classy Vision is not longer actively maintained. + +The latest stable version is 0.7.0 and is available on pip, and has been tested to work with Pytorch 2.0. + ## What's New: - March 2021: Added [RegNetZ models](https://arxiv.org/abs/2103.06877) diff --git a/classy_vision/__init__.py b/classy_vision/__init__.py index 16caa4843..ad3d4c77e 100644 --- a/classy_vision/__init__.py +++ b/classy_vision/__init__.py @@ -4,4 +4,4 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -__version__ = "0.7.0.dev" +__version__ = "0.7.0" diff --git a/requirements.txt b/requirements.txt index 9611612d1..e21cf741b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ fvcore>=0.1.3 -setuptools<58 torch>=1.6 torchvision>=0.7 -wheel