mirror of
https://github.com/facebookresearch/pytorch3d.git
synced 2025-08-01 03:12:49 +08:00
CI updates
Summary: Document existence of nightly build. Fix some mistakes in windows-related CI code (not running yet). Reviewed By: nikhilaravi Differential Revision: D20030293 fbshipit-source-id: 2199ea7c6d34e881aa5641726feb6bfc20337ce3
This commit is contained in:
parent
c2a0a3e3ba
commit
dab7f61a12
@ -188,10 +188,6 @@ workflows:
|
||||
jobs:
|
||||
- main
|
||||
{{workflows()}}
|
||||
- binary_linux_conda:
|
||||
cu_version: cu101
|
||||
name: binary_linux_conda_py3.7_cu101
|
||||
python_version: '3.7'
|
||||
- binary_linux_conda_cuda:
|
||||
name: testrun_conda_cuda_py3.7_cu100
|
||||
python_version: "3.7"
|
||||
|
@ -247,12 +247,8 @@ workflows:
|
||||
name: binary_linux_conda_py3.8_cu101
|
||||
python_version: '3.8'
|
||||
pytorch_version: '1.4'
|
||||
- binary_linux_conda:
|
||||
cu_version: cu101
|
||||
name: binary_linux_conda_py3.7_cu101
|
||||
python_version: '3.7'
|
||||
- binary_linux_conda_cuda:
|
||||
name: testrun_conda_cuda_py3.7_cu100
|
||||
python_version: "3.7"
|
||||
pytorch_version: "1.4"
|
||||
cu_version: "cu100"
|
||||
cu_version: "cu100"
|
||||
|
@ -112,7 +112,10 @@ def indent(indentation, data_list):
|
||||
if __name__ == "__main__":
|
||||
d = os.path.dirname(__file__)
|
||||
env = jinja2.Environment(
|
||||
loader=jinja2.FileSystemLoader(d), lstrip_blocks=True, autoescape=False
|
||||
loader=jinja2.FileSystemLoader(d),
|
||||
lstrip_blocks=True,
|
||||
autoescape=False,
|
||||
keep_trailing_newline=True,
|
||||
)
|
||||
|
||||
with open(os.path.join(d, "config.yml"), "w") as f:
|
||||
|
@ -55,6 +55,12 @@ After installing the above dependencies, run one of the following commands:
|
||||
conda install pytorch3d -c pytorch3d
|
||||
```
|
||||
|
||||
Or, to install a nightly (non-official, alpha) build:
|
||||
```
|
||||
# Anaconda Cloud
|
||||
conda install pytorch3d -c pytorch3d-nightly
|
||||
```
|
||||
|
||||
### 2. Install from GitHub
|
||||
```
|
||||
pip install 'git+https://github.com/facebookresearch/pytorch3d.git'
|
||||
|
@ -72,9 +72,6 @@ if [[ ! -d "$pytorch3d_rootdir" ]]; then
|
||||
rm -rf "$pytorch3d_rootdir"
|
||||
git clone SOURCE_DIR/../.. "$pytorch3d_rootdir"
|
||||
|
||||
# pushd "$vision_rootdir"
|
||||
# git checkout $PYTORCH_BRANCH
|
||||
# popd
|
||||
fi
|
||||
|
||||
cd "$SOURCE_DIR"
|
||||
@ -94,7 +91,6 @@ ANACONDA_USER=pytorch-nightly
|
||||
conda config --set anaconda_upload no
|
||||
|
||||
|
||||
export TORCHVISION_PACKAGE_SUFFIX=""
|
||||
if [[ "$desired_cuda" == 'cpu' ]]; then
|
||||
export CONDA_CUDATOOLKIT_CONSTRAINT=""
|
||||
export CONDA_CPUONLY_FEATURE="- cpuonly # [not osx]"
|
||||
@ -164,7 +160,7 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
|
||||
--output-folder "$output_folder" \
|
||||
../$VSTOOLCHAIN_PACKAGE
|
||||
|
||||
cp ../$VSTOOLCHAIN_PACKAGE/conda_build_config.yaml ../torchvision/conda_build_config.yaml
|
||||
cp ../$VSTOOLCHAIN_PACKAGE/conda_build_config.yaml ../pytorch3d/conda_build_config.yaml
|
||||
|
||||
conda config --set anaconda_upload no
|
||||
echo "Calling conda-build at $(date)"
|
||||
@ -182,7 +178,7 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
|
||||
--output-folder "$output_folder" \
|
||||
--no-verify \
|
||||
--no-test \
|
||||
../torchvision
|
||||
../pytorch3d
|
||||
else
|
||||
time CMAKE_ARGS=${CMAKE_ARGS[@]} \
|
||||
BUILD_VERSION="$PYTORCH3D_BUILD_VERSION" \
|
||||
@ -196,13 +192,13 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
|
||||
--output-folder "$output_folder" \
|
||||
--no-verify \
|
||||
--no-test \
|
||||
../torchvision
|
||||
../pytorch3d
|
||||
fi
|
||||
echo "Finished conda-build at $(date)"
|
||||
|
||||
# Extract the package for testing
|
||||
ls -lah "$output_folder"
|
||||
built_package="$(find $output_folder/ -name '*torchvision*.tar.bz2')"
|
||||
built_package="$(find $output_folder/ -name '*pytorch3d*.tar.bz2')"
|
||||
|
||||
# Copy the built package to the host machine for persistence before testing
|
||||
if [[ -n "$PYTORCH_FINAL_PACKAGE_DIR" ]]; then
|
||||
|
@ -260,6 +260,6 @@ setup_visual_studio_constraint() {
|
||||
export VSDEVCMD_ARGS=''
|
||||
# shellcheck disable=SC2086
|
||||
conda build $CONDA_CHANNEL_FLAGS --no-anaconda-upload packaging/$VSTOOLCHAIN_PACKAGE
|
||||
cp packaging/$VSTOOLCHAIN_PACKAGE/conda_build_config.yaml packaging/torchvision/conda_build_config.yaml
|
||||
cp packaging/$VSTOOLCHAIN_PACKAGE/conda_build_config.yaml packaging/pytorch3d/conda_build_config.yaml
|
||||
fi
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user