Skip to content

Commit

Permalink
drop support for python3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierLDff committed Aug 17, 2023
1 parent ab03831 commit 36531b4
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Set up Python version
uses: actions/setup-python@v4
with:
python-version: '3.7'
python-version: '3.8'

- name: Install dependencies
env:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Set up Python version
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.8
- name: Install dependencies
run: |
brew install ccache pkg-config
Expand Down Expand Up @@ -124,12 +124,10 @@ jobs:
fail-fast: false
# https://github.community/t/how-to-conditionally-include-exclude-items-in-matrix-eg-based-on-branch/16853/6
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand Down Expand Up @@ -230,12 +228,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Python version
uses: actions/setup-python@v4
with:
python-version: '3.7'
python-version: '3.8'
- name: Install dependencies
run: |
pip install -U clang-format~=10.0.0 yapf==0.30.0 nbformat
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/ubuntu-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand All @@ -53,18 +51,14 @@ jobs:
# `docker/docker_build.sh xxx` command to execute locally.
- name: Docker build
run: |
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
if [ "${{ env.PYTHON_VERSION }}" = "3.8" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py38_dev
elif [ "${{ env.PYTHON_VERSION }}" = "3.9" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py39_dev
elif [ "${{ env.PYTHON_VERSION }}" = "3.10" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py310_dev
elif [ "${{ env.PYTHON_VERSION }}" = "3.11" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cuda_wheel_py311_dev
elif [ "${{ env.PYTHON_VERSION }}" = "3.7" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
docker/docker_build.sh cuda_wheel_py37
elif [ "${{ env.PYTHON_VERSION }}" = "3.8" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
docker/docker_build.sh cuda_wheel_py38
elif [ "${{ env.PYTHON_VERSION }}" = "3.9" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
Expand Down Expand Up @@ -118,12 +112,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Set up Python version
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.8

- name: Config
# Move build directory to C: https://github.com/actions/virtual-environments/issues/1341
Expand Down Expand Up @@ -246,12 +246,10 @@ jobs:
fail-fast: false
# https://github.community/t/how-to-conditionally-include-exclude-items-in-matrix-eg-based-on-branch/16853/6
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand Down Expand Up @@ -351,12 +349,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python_version: ['3.8', '3.9', '3.10', '3.11']
is_master:
- ${{ github.ref == 'refs/heads/master' }}
exclude:
- is_master: false
python_version: '3.7'
- is_master: false
python_version: '3.8'
- is_master: false
Expand Down
63 changes: 15 additions & 48 deletions docker/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,20 @@ __usage_docker_build="USAGE:
OPTION:
# OpenBLAS AMD64 (Dockerfile.openblas)
openblas-amd64-py37-dev : OpenBLAS AMD64 3.7 wheel, developer mode
openblas-amd64-py38-dev : OpenBLAS AMD64 3.8 wheel, developer mode
openblas-amd64-py39-dev : OpenBLAS AMD64 3.9 wheel, developer mode
openblas-amd64-py310-dev : OpenBLAS AMD64 3.10 wheel, developer mode
openblas-amd64-py311-dev : OpenBLAS AMD64 3.11 wheel, developer mode
openblas-amd64-py37 : OpenBLAS AMD64 3.7 wheel, release mode
openblas-amd64-py38 : OpenBLAS AMD64 3.8 wheel, release mode
openblas-amd64-py39 : OpenBLAS AMD64 3.9 wheel, release mode
openblas-amd64-py310 : OpenBLAS AMD64 3.10 wheel, release mode
openblas-amd64-py311 : OpenBLAS AMD64 3.11 wheel, release mode
# OpenBLAS ARM64 (Dockerfile.openblas)
openblas-arm64-py37-dev : OpenBLAS ARM64 3.7 wheel, developer mode
openblas-arm64-py38-dev : OpenBLAS ARM64 3.8 wheel, developer mode
openblas-arm64-py39-dev : OpenBLAS ARM64 3.9 wheel, developer mode
openblas-arm64-py310-dev : OpenBLAS ARM64 3.10 wheel, developer mode
openblas-arm64-py311-dev : OpenBLAS ARM64 3.11 wheel, developer mode
openblas-arm64-py37 : OpenBLAS ARM64 3.7 wheel, release mode
openblas-arm64-py38 : OpenBLAS ARM64 3.8 wheel, release mode
openblas-arm64-py39 : OpenBLAS ARM64 3.9 wheel, release mode
openblas-arm64-py310 : OpenBLAS ARM64 3.10 wheel, release mode
Expand All @@ -66,12 +62,10 @@ OPTION:
5-ml-focal : CUDA CI, 5-ml-focal, developer mode
# CUDA wheels (Dockerfile.wheel)
cuda_wheel_py37_dev : CUDA Python 3.7 wheel, developer mode
cuda_wheel_py38_dev : CUDA Python 3.8 wheel, developer mode
cuda_wheel_py39_dev : CUDA Python 3.9 wheel, developer mode
cuda_wheel_py310_dev : CUDA Python 3.10 wheel, developer mode
cuda_wheel_py311_dev : CUDA Python 3.11 wheel, developer mode
cuda_wheel_py37 : CUDA Python 3.7 wheel, release mode
cuda_wheel_py38 : CUDA Python 3.8 wheel, release mode
cuda_wheel_py39 : CUDA Python 3.9 wheel, release mode
cuda_wheel_py310 : CUDA Python 3.10 wheel, release mode
Expand Down Expand Up @@ -121,10 +115,7 @@ openblas_export_env() {
print_usage_and_exit_docker_build
fi

if [[ "py37" =~ ^($options)$ ]]; then
export PYTHON_VERSION=3.7
export DOCKER_TAG=${DOCKER_TAG}-py37
elif [[ "py38" =~ ^($options)$ ]]; then
if [[ "py38" =~ ^($options)$ ]]; then
export PYTHON_VERSION=3.8
export DOCKER_TAG=${DOCKER_TAG}-py38
elif [[ "py39" =~ ^($options)$ ]]; then
Expand Down Expand Up @@ -183,9 +174,7 @@ cuda_wheel_build() {

options="$(echo "$@" | tr ' ' '|')"
echo "[cuda_wheel_build()] options: ${options}"
if [[ "py37" =~ ^($options)$ ]]; then
PYTHON_VERSION=3.7
elif [[ "py38" =~ ^($options)$ ]]; then
if [[ "py38" =~ ^($options)$ ]]; then
PYTHON_VERSION=3.8
elif [[ "py39" =~ ^($options)$ ]]; then
PYTHON_VERSION=3.9
Expand Down Expand Up @@ -271,7 +260,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-2-bionic
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=OFF
export BUILD_CUDA_MODULE=ON
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -286,7 +275,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-3-ml-shared-bionic
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
Expand All @@ -302,7 +291,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
export DEVELOPER_BUILD=OFF
export CCACHE_TAR_NAME=open3d-ci-3-ml-shared-bionic
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
Expand All @@ -318,7 +307,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-4-shared-bionic
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -333,7 +322,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
export DEVELOPER_BUILD=OFF
export CCACHE_TAR_NAME=open3d-ci-4-shared-bionic
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=ON
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -348,7 +337,7 @@ ci_build() {
export BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-5-ml-focal
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=OFF
export BUILD_CUDA_MODULE=ON
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
Expand All @@ -364,7 +353,7 @@ cpu-static_export_env() {
export BASE_IMAGE=ubuntu:18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=OFF
export BUILD_CUDA_MODULE=OFF
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -379,7 +368,7 @@ cpu-shared_export_env() {
export BASE_IMAGE=ubuntu:18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -394,7 +383,7 @@ cpu-shared-ml_export_env() {
export BASE_IMAGE=ubuntu:18.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
Expand All @@ -410,7 +399,7 @@ cpu-shared-release_export_env() {
export BASE_IMAGE=ubuntu:18.04
export DEVELOPER_BUILD=OFF
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -425,7 +414,7 @@ cpu-shared-ml-release_export_env() {
export BASE_IMAGE=ubuntu:18.04
export DEVELOPER_BUILD=OFF
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: re-enable tensorflow support, off due to due to cxx11_abi issue with PyTorch
Expand All @@ -443,7 +432,7 @@ sycl-shared_export_env() {
export BASE_IMAGE=intel/oneapi-basekit:2022.2-devel-ubuntu20.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-sycl
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -460,7 +449,7 @@ sycl-static_export_env() {
export BASE_IMAGE=intel/oneapi-basekit:2022.2-devel-ubuntu20.04
export DEVELOPER_BUILD=ON
export CCACHE_TAR_NAME=open3d-ci-sycl
export PYTHON_VERSION=3.7
export PYTHON_VERSION=3.8
export BUILD_SHARED_LIBS=OFF
export BUILD_CUDA_MODULE=OFF
export BUILD_TENSORFLOW_OPS=OFF
Expand All @@ -477,10 +466,6 @@ function main() {
echo "[$(basename $0)] building $1"
case "$1" in
# OpenBLAS AMD64
openblas-amd64-py37-dev)
openblas_export_env amd64 py37 dev
openblas_build
;;
openblas-amd64-py38-dev)
openblas_export_env amd64 py38 dev
openblas_build
Expand All @@ -497,10 +482,6 @@ function main() {
openblas_export_env amd64 py311 dev
openblas_build
;;
openblas-amd64-py37)
openblas_export_env amd64 py37
openblas_build
;;
openblas-amd64-py38)
openblas_export_env amd64 py38
openblas_build
Expand All @@ -519,10 +500,6 @@ function main() {
;;

# OpenBLAS ARM64
openblas-arm64-py37-dev)
openblas_export_env arm64 py37 dev
openblas_build
;;
openblas-arm64-py38-dev)
openblas_export_env arm64 py38 dev
openblas_build
Expand All @@ -539,10 +516,6 @@ function main() {
openblas_export_env arm64 py311 dev
openblas_build
;;
openblas-arm64-py37)
openblas_export_env arm64 py37
openblas_build
;;
openblas-arm64-py38)
openblas_export_env arm64 py38
openblas_build
Expand Down Expand Up @@ -593,9 +566,6 @@ function main() {
;;

# CUDA wheels
cuda_wheel_py37_dev)
cuda_wheel_build py37 dev
;;
cuda_wheel_py38_dev)
cuda_wheel_build py38 dev
;;
Expand All @@ -608,9 +578,6 @@ function main() {
cuda_wheel_py311_dev)
cuda_wheel_build py311 dev
;;
cuda_wheel_py37)
cuda_wheel_build py37
;;
cuda_wheel_py38)
cuda_wheel_build py38
;;
Expand Down
Loading

0 comments on commit 36531b4

Please sign in to comment.