Skip to content

Commit ee6cb1a

Browse files
authored
Upgrade PyTorch to 1.13.1
Tensorboard to v2.8.4 Other security updates. Upgrade pillow to fix CVE-2022-45199
2 parents e687c8b + 5fc77b0 commit ee6cb1a

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

ci/run_ci.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
# - NPROC
55
#
66
TENSORFLOW_VER="2.8.2"
7-
TORCH_GLNX_VER="1.12.0+cpu"
7+
TORCH_GLNX_VER="1.13.1+cpu"
88
# OPENVINO_DEV_VER="2021.4.2" # Numpy version conflict with TF 2.8.2
99
PIP_VER="21.1.1"
10-
WHEEL_VER="0.37.1"
11-
STOOLS_VER="50.3.2"
10+
WHEEL_VER="0.38.4"
11+
STOOLS_VER="67.3.2"
1212
YAPF_VER="0.30.0"
1313
PYTEST_VER="7.1.2"
1414
PYTEST_RANDOMLY_VER="3.8.0"
@@ -21,11 +21,11 @@ export PATH_TO_OPEN3D_ML=$(pwd)
2121
# the build system of the main repo expects a master branch. make sure master exists
2222
git checkout -b master || true
2323
python -m pip install -U pip==$PIP_VER \
24-
wheel=="$WHEEL_VER" \
25-
setuptools=="$STOOLS_VER" \
26-
yapf=="$YAPF_VER" \
27-
pytest=="$PYTEST_VER" \
28-
pytest-randomly=="$PYTEST_RANDOMLY_VER"
24+
wheel=="$WHEEL_VER" \
25+
setuptools=="$STOOLS_VER" \
26+
yapf=="$YAPF_VER" \
27+
pytest=="$PYTEST_VER" \
28+
pytest-randomly=="$PYTEST_RANDOMLY_VER"
2929

3030
python -m pip install -r requirements.txt
3131
echo $PATH_TO_OPEN3D_ML
@@ -38,24 +38,24 @@ git clone --recursive --branch master https://github.com/isl-org/Open3D.git
3838

3939
./Open3D/util/install_deps_ubuntu.sh assume-yes
4040
python -m pip install -U tensorflow-cpu==$TENSORFLOW_VER \
41-
torch==${TORCH_GLNX_VER} --extra-index-url https://download.pytorch.org/whl/cpu/
41+
torch==${TORCH_GLNX_VER} --extra-index-url https://download.pytorch.org/whl/cpu/
4242
# openvino-dev=="$OPENVINO_DEV_VER"
4343

4444
echo 3. Configure for bundling the Open3D-ML part
4545
echo
4646
mkdir Open3D/build
4747
pushd Open3D/build
4848
cmake -DBUNDLE_OPEN3D_ML=ON \
49-
-DOPEN3D_ML_ROOT=$PATH_TO_OPEN3D_ML \
50-
-DGLIBCXX_USE_CXX11_ABI=OFF \
51-
-DBUILD_TENSORFLOW_OPS=ON \
52-
-DBUILD_PYTORCH_OPS=ON \
53-
-DBUILD_GUI=OFF \
54-
-DBUILD_RPC_INTERFACE=OFF \
55-
-DBUILD_UNIT_TESTS=OFF \
56-
-DBUILD_BENCHMARKS=OFF \
57-
-DBUILD_EXAMPLES=OFF \
58-
..
49+
-DOPEN3D_ML_ROOT=$PATH_TO_OPEN3D_ML \
50+
-DGLIBCXX_USE_CXX11_ABI=OFF \
51+
-DBUILD_TENSORFLOW_OPS=ON \
52+
-DBUILD_PYTORCH_OPS=ON \
53+
-DBUILD_GUI=OFF \
54+
-DBUILD_RPC_INTERFACE=OFF \
55+
-DBUILD_UNIT_TESTS=OFF \
56+
-DBUILD_BENCHMARKS=OFF \
57+
-DBUILD_EXAMPLES=OFF \
58+
..
5959

6060
echo 4. Build and install wheel
6161
echo

requirements-tensorflow.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tensorflow~=2.8.2
1+
tensorflow~=2.8.4

requirements-torch-cuda.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-f https://download.pytorch.org/whl/torch/
2-
torch==1.12.0+cu116
2+
torch==1.13.1+cu116
33
-f https://download.pytorch.org/whl/torchvision/
4-
torchvision==0.13.0+cu116
5-
tensorboard~=2.8.0
4+
torchvision==0.14.1+cu116
5+
tensorboard

requirements-torch.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--extra-index-url https://download.pytorch.org/whl/cpu/
2-
torch==1.12.0+cpu ; sys_platform != 'darwin'
3-
torchvision==0.13.0+cpu ; sys_platform != 'darwin'
4-
torch==1.12.0 ; sys_platform == 'darwin'
5-
torchvision==0.13.0 ; sys_platform == 'darwin'
2+
torch==1.13.1+cpu ; sys_platform != 'darwin'
3+
torchvision==0.14.1+cpu ; sys_platform != 'darwin'
4+
torch==1.13.1 ; sys_platform == 'darwin'
5+
torchvision==0.14.1 ; sys_platform == 'darwin'
66
tensorboard

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addict
2-
pillow>=8.2.0
2+
pillow>=9.3.0
33
matplotlib>=3
44
numpy>1.15
55
pandas>=1.0

0 commit comments

Comments
 (0)