mirror of
				https://github.com/facebookresearch/pytorch3d.git
				synced 2025-11-04 18:02:14 +08:00 
			
		
		
		
	Version number in one place in the code.
Summary: This isn't the whole task, but it gets the version number into far fewer places. The doc / website are separate. Reviewed By: nikhilaravi Differential Revision: D20426113 fbshipit-source-id: 5810d1eca58b443fcd5f46991dc2f0f26adedbd8
This commit is contained in:
		
							parent
							
								
									2361845548
								
							
						
					
					
						commit
						4d3c886677
					
				@ -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'
 | 
			
		||||
 | 
			
		||||
@ -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'
 | 
			
		||||
 | 
			
		||||
@ -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",
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										7
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								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 "
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user