diff --git a/.circleci/config.in.yml b/.circleci/config.in.yml index 0abf22b8..139f6cbb 100644 --- a/.circleci/config.in.yml +++ b/.circleci/config.in.yml @@ -212,19 +212,16 @@ workflows: pytorch_version: "1.4" cu_version: "cu100" - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.6_cpu python_version: '3.6' pytorch_version: '1.4' - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.7_cpu python_version: '3.7' pytorch_version: '1.4' - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.8_cpu python_version: '3.8' diff --git a/.circleci/config.yml b/.circleci/config.yml index ee861b29..676f67dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -206,79 +206,67 @@ workflows: jobs: - main - binary_linux_conda: - build_version: 0.1.1 cu_version: cu92 name: binary_linux_conda_py3.6_cu92 python_version: '3.6' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda92 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu100 name: binary_linux_conda_py3.6_cu100 python_version: '3.6' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda100 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu101 name: binary_linux_conda_py3.6_cu101 python_version: '3.6' pytorch_version: '1.4' - binary_linux_conda: - build_version: 0.1.1 cu_version: cu92 name: binary_linux_conda_py3.7_cu92 python_version: '3.7' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda92 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu100 name: binary_linux_conda_py3.7_cu100 python_version: '3.7' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda100 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu101 name: binary_linux_conda_py3.7_cu101 python_version: '3.7' pytorch_version: '1.4' - binary_linux_conda: - build_version: 0.1.1 cu_version: cu92 name: binary_linux_conda_py3.8_cu92 python_version: '3.8' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda92 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu100 name: binary_linux_conda_py3.8_cu100 python_version: '3.8' pytorch_version: '1.4' wheel_docker_image: pytorch/manylinux-cuda100 - binary_linux_conda: - build_version: 0.1.1 cu_version: cu101 name: binary_linux_conda_py3.8_cu101 python_version: '3.8' pytorch_version: '1.4' - binary_linux_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.6_cpu python_version: '3.6' pytorch_version: '1.4' - binary_linux_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.7_cpu python_version: '3.7' pytorch_version: '1.4' - binary_linux_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.8_cpu python_version: '3.8' @@ -289,19 +277,16 @@ workflows: pytorch_version: "1.4" cu_version: "cu100" - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.6_cpu python_version: '3.6' pytorch_version: '1.4' - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.7_cpu python_version: '3.7' pytorch_version: '1.4' - binary_macos_wheel: - build_version: 0.1.1 cu_version: cpu name: binary_linux_wheel_py3.8_cpu python_version: '3.8' diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 72a6256b..39638e5f 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -80,7 +80,6 @@ def generate_base_workflow( "name": base_workflow_name, "python_version": python_version, "cu_version": cu_version, - "build_version": "0.1.1", "pytorch_version": "1.4", } diff --git a/packaging/build_conda.sh b/packaging/build_conda.sh index 0c3aad19..6d9110d5 100755 --- a/packaging/build_conda.sh +++ b/packaging/build_conda.sh @@ -5,8 +5,10 @@ set -ex script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" +VERSION=$(python -c "exec(open('${script_dir}/../pytorch3d/__init__.py').read()); print(__version__)") + export BUILD_TYPE=conda -setup_env 0.1.1 +setup_env "$VERSION" export SOURCE_ROOT_DIR="$PWD" setup_conda_pytorch_constraint setup_conda_cudatoolkit_constraint diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index 8b46f47e..2d256baf 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -5,8 +5,10 @@ set -ex script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" +VERSION=$(python -c "exec(open('${script_dir}/../pytorch3d/__init__.py').read()); print(__version__)") + export BUILD_TYPE=wheel -setup_env 0.1.1 +setup_env "$VERSION" setup_wheel_python pip_install numpy setup_pip_pytorch_version diff --git a/setup.py b/setup.py index bb9181be..9d233555 100755 --- a/setup.py +++ b/setup.py @@ -66,9 +66,14 @@ def get_extensions(): return ext_modules +__version__ = "" +# Retrieve __version__ from the package. +with open("pytorch3d/__init__.py", "r") as init: + exec(init.read()) + setup( name="pytorch3d", - version="0.1.1", + version=__version__, author="FAIR", url="https://github.com/facebookresearch/pytorch3d", description="PyTorch3d is FAIR's library of reusable components "