Skip to content

Commit

Permalink
Tensorflow 2.8.2
Browse files Browse the repository at this point in the history
tf 2.9.1 wheel has new cxx11_abi
Update wheel 0.37.1
scipy 1.7.3
Re-order pip install requirements to ensure jinja ver lock is honoured
  • Loading branch information
ssheorey committed Jul 16, 2022
1 parent 16cd09c commit 78188c4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# `docker/docker_build.sh xxx` command to execute locally.
- name: Docker build
run: |
elif [ "${{ env.PYTHON_VERSION }}" = "3.7" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
if [ "${{ env.PYTHON_VERSION }}" = "3.7" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py37_dev
elif [ "${{ env.PYTHON_VERSION }}" = "3.8" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py38_dev
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ concurrency:

env:
PIP_VER: "21.1.1"
WHEEL_VER: "0.35.1"
WHEEL_VER: "0.37.1"
STOOLS_VER: "50.3.2"
PYTEST_VER: "6.0.1"
PYTEST_RANDOMLY_VER: "3.8.0"
SCIPY_VER: "1.5.4"
SCIPY_VER: "1.7.3"
JEDI_VER: "0.17.2" # https://github.com/ipython/ipython/issues/12740
IDNA_VER: "2.8" # https://github.com/psf/requests/issues/5710
SRC_DIR: "D:\\a\\open3d\\open3d"
Expand Down Expand Up @@ -362,8 +362,7 @@ jobs:
setuptools==${{ env.STOOLS_VER }}
python -m pip install -U pytest==${{ env.PYTEST_VER }}
python -m pip install -U pytest-randomly==${{ env.PYTEST_RANDOMLY_VER }}
python -m pip install -U scipy==${{ env.SCIPY_VER }} `
tensorboard==${{ env.TENSORFLOW_VER }}
python -m pip install -U scipy==${{ env.SCIPY_VER }}
$py_tag=(python -c "import sys; print(f'cp{sys.version_info.major}{sys.version_info.minor}')")
if (Test-Path -Path "pip_package") {
$PIP_PKG_NAME=(Get-ChildItem pip_package\open3d*-$py_tag-*.whl).Name
Expand Down
2 changes: 1 addition & 1 deletion python/requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==6.0.1
pytest-randomly==3.8.0
scipy==1.7.3
tensorboard==2.9.1
tensorboard==2.8.0
16 changes: 8 additions & 8 deletions util/ci_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ else
GCC_MAX_VER=7
fi
# ML
TENSORFLOW_VER="2.9.1"
TENSORBOARD_VER="2.9.1"
TENSORFLOW_VER="2.8.2"
TENSORBOARD_VER="2.8.0"
TORCH_CPU_GLNX_VER="1.12.0+cpu"
TORCH_CUDA_GLNX_VER="1.12.0+cu113"
PYTHON_VER=$(python -c 'import sys; ver=f"{sys.version_info.major}{sys.version_info.minor}"; print(f"cp{ver}-cp{ver}{sys.abiflags}")' 2>/dev/null || true)
Expand All @@ -50,11 +50,11 @@ TORCH_MACOS_VER="1.12.0"
TORCH_REPO_URL="https://download.pytorch.org/whl/torch/"
# Python
PIP_VER="21.1.1"
WHEEL_VER="0.35.1"
WHEEL_VER="0.37.1"
STOOLS_VER="50.3.2"
PYTEST_VER="6.0.1"
PYTEST_RANDOMLY_VER="3.8.0"
SCIPY_VER="1.5.4"
SCIPY_VER="1.7.3"
YAPF_VER="0.30.0"
PROTOBUF_VER="3.19.0"

Expand Down Expand Up @@ -375,10 +375,6 @@ install_docs_dependencies() {
python -m pip install -U -q "wheel==$WHEEL_VER" \
"pip==$PIP_VER"
python -m pip install -U -q "yapf==$YAPF_VER"
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/docs/requirements.txt"
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/python/requirements.txt"
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/python/requirements_jupyter_build.txt"
echo
if [[ -d "$1" ]]; then
OPEN3D_ML_ROOT="$1"
echo Installing Open3D-ML dependencies from "${OPEN3D_ML_ROOT}"
Expand All @@ -389,6 +385,10 @@ install_docs_dependencies() {
else
echo OPEN3D_ML_ROOT="$OPEN3D_ML_ROOT" not specified or invalid. Skipping ML dependencies.
fi
echo
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/python/requirements.txt"
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/python/requirements_jupyter_build.txt"
python -m pip install -r "${OPEN3D_SOURCE_ROOT}/docs/requirements.txt"
}

# Build documentation
Expand Down

0 comments on commit 78188c4

Please sign in to comment.