Skip to content

Commit

Permalink
Cache storage change: gz->xz, 5->4GB
Browse files Browse the repository at this point in the history
Test XCode 16.3 (XCode 14 is not available on github)
XCode 15 causes errors with embree.
  • Loading branch information
ssheorey committed Dec 5, 2024
1 parent 6e910d9 commit 9c9d9d1
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
# Newer Xcode versions work, but embree recommends Apple clang <= 14 on
# arm64 to avoid possible "EXEC_BAD_INSTRUCTION" runtime exceptions:
# https://github.com/embree/embree/releases/tag/v4.3.1
sudo xcode-select -switch /Applications/Xcode_14.3.1.app
sudo xcode-select -switch /Applications/Xcode_16.1.0.app
fi
# Install libomp 11.1.0 from old brew bottle for x64 catalina (10.15)
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
# Fix macos-14 arm64 runner image issues, see comments in MacOS job.
if [[ ${{ runner.arch}} == "ARM64" ]]; then
ln -s $(which gfortran-13) /usr/local/bin/gfortran
sudo xcode-select -switch /Applications/Xcode_14.3.1.app
sudo xcode-select -switch /Applications/Xcode_16.1.0.app
fi
# Install libomp 11.1.0. See comment above.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
gcloud compute ssh "${INSTANCE_NAME}" \
--zone="${GCE_ZONE}" \
--command="ls -alh \
&& gsutil cp ${CCACHE_TAR_NAME}.tar.gz gs://open3d-ci-cache/"
&& gsutil cp ${CCACHE_TAR_NAME}.tar.xz gs://open3d-ci-cache/"
- name: VM delete
if: always()
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ RUN CCACHE_DIR=$(ccache -p | grep cache_dir | grep -oE "[^ ]+$") \
&& CCACHE_DIR_PARENT=$(dirname ${CCACHE_DIR}) \
&& mkdir -p ${CCACHE_DIR_PARENT} \
&& cd ${CCACHE_DIR_PARENT} \
&& (wget -q https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.gz || true) \
&& if [ -f ${CCACHE_TAR_NAME}.tar.gz ]; then tar -xf ${CCACHE_TAR_NAME}.tar.gz; fi \
&& (wget -q https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.xz https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.gz || true) \
&& if [ -f ${CCACHE_TAR_NAME}.tar.?z ]; then tar -xf ${CCACHE_TAR_NAME}.tar.?z; fi \
&& mkdir -p ${CCACHE_DIR} \
&& ccache -M 5G \
&& ccache -M 4G \
&& ccache -s

# Checkout Open3D-ML main branch
Expand Down Expand Up @@ -235,7 +235,7 @@ RUN ccache -s \
&& CCACHE_DIR_NAME=$(basename ${CCACHE_DIR}) \
&& CCACHE_DIR_PARENT=$(dirname ${CCACHE_DIR}) \
&& cd ${CCACHE_DIR_PARENT} \
&& tar -czf /${CCACHE_TAR_NAME}.tar.gz ${CCACHE_DIR_NAME} \
&& tar -caf /${CCACHE_TAR_NAME}.tar.xz ${CCACHE_DIR_NAME} \
&& if [ "${PACKAGE}" = "ON" ]; then mv /root/Open3D/build/package/open3d-devel*.tar.xz /; fi \
&& if [ "${PACKAGE}" = "VIEWER" ]; then mv /root/Open3D/build/package-Open3DViewer-deb/open3d-viewer-*-Linux.deb /; fi \
&& ls -alh /
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile.wheel
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ RUN CCACHE_DIR=$(ccache -p | grep cache_dir | grep -oE "[^ ]+$") \
&& CCACHE_DIR_PARENT=$(dirname ${CCACHE_DIR}) \
&& mkdir -p ${CCACHE_DIR_PARENT} \
&& cd ${CCACHE_DIR_PARENT} \
&& (wget -q https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.gz || true) \
&& if [ -f ${CCACHE_TAR_NAME}.tar.gz ]; then tar -xf ${CCACHE_TAR_NAME}.tar.gz; fi
&& (wget -q https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.xz https://storage.googleapis.com/open3d-ci-cache/${CCACHE_TAR_NAME}.tar.gz || true) \
&& if [ -f ${CCACHE_TAR_NAME}.tar.?z ]; then tar -xf ${CCACHE_TAR_NAME}.tar.?z; fi
# We need to set ccache size explicitly with -M, otherwise the default size is
# *not* determined by ccache's default, but the downloaded ccache file's config.
RUN ccache -M 5G \
RUN ccache -M 4G \
&& ccache -s

# Miniconda
Expand Down Expand Up @@ -141,6 +141,6 @@ RUN ccache -s \
&& CCACHE_DIR_NAME=$(basename ${CCACHE_DIR}) \
&& CCACHE_DIR_PARENT=$(dirname ${CCACHE_DIR}) \
&& cd ${CCACHE_DIR_PARENT} \
&& tar -czf /${CCACHE_TAR_NAME}.tar.gz ${CCACHE_DIR_NAME}
&& tar -caf /${CCACHE_TAR_NAME}.tar.xz ${CCACHE_DIR_NAME}

RUN echo "Docker build done."
6 changes: 3 additions & 3 deletions docker/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ cuda_wheel_build() {
python_package_dir=/root/Open3D/build/lib/python_package
docker run -v "${PWD}:/opt/mount" --rm open3d-ci:wheel \
bash -c "cp ${python_package_dir}/pip_package/open3d*.whl /opt/mount \
&& cp /${CCACHE_TAR_NAME}.tar.gz /opt/mount \
&& cp /${CCACHE_TAR_NAME}.tar.xz /opt/mount \
&& chown $(id -u):$(id -g) /opt/mount/open3d*.whl \
&& chown $(id -u):$(id -g) /opt/mount/${CCACHE_TAR_NAME}.tar.gz"
&& chown $(id -u):$(id -g) /opt/mount/${CCACHE_TAR_NAME}.tar.xz"
}

ci_build() {
Expand Down Expand Up @@ -417,7 +417,7 @@ cpu-shared-release_export_env() {
export BASE_IMAGE=ubuntu:20.04
export DEVELOPER_BUILD=OFF
export CCACHE_TAR_NAME=open3d-ci-cpu
export PYTHON_VERSION=3.12 # no TF versions after 2.13.2 for Python 3.8
export PYTHON_VERSION=3.12 # no TF versions after 2.13.2 for Python 3.8
export BUILD_SHARED_LIBS=ON
export BUILD_CUDA_MODULE=OFF
# TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
Expand Down
12 changes: 7 additions & 5 deletions util/ci_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ install_python_dependencies() {
if [[ "with-cuda" =~ ^($options)$ ]]; then
TF_ARCH_NAME=tensorflow
TF_ARCH_DISABLE_NAME=tensorflow-cpu
CUDA_VER=$(nvcc --version | grep "release " | cut -c33-37 | sed 's|[^0-9]||g') # e.g.: 117, 118, 121, ...
CUDA_VER=$(nvcc --version | grep "release " | cut -c33-37 | sed 's|[^0-9]||g') # e.g.: 117, 118, 121, ...
TORCH_GLNX="torch==${TORCH_VER}+cu${CUDA_VER}"
else
# tensorflow-cpu wheels for macOS arm64 are not available
Expand Down Expand Up @@ -260,14 +260,16 @@ test_wheel() {
# find "$DLL_PATH"/cpu/ -type f -execdir otool -L {} \;
# fi
echo
if [ "$BUILD_PYTORCH_OPS" == ON ]; then
if python -c "import sys, open3d; sys.exit(not open3d._build_config['BUILD_PYTORCH_OPS'])"; then
BUILD_PYTORCH_OPS=ON
python -m pip install -r "$OPEN3D_ML_ROOT/requirements-torch.txt"
python -W default -c \
python -W default -c \
"import open3d.ml.torch; print('PyTorch Ops library loaded:', open3d.ml.torch._loaded)"
fi
if [ "$BUILD_TENSORFLOW_OPS" == ON ]; then
if python -c "import sys, open3d; sys.exit(not open3d._build_config['BUILD_TENSORFLOW_OPS'])"; then
BUILD_TENSORFLOW_OPS=ON
python -m pip install -r "$OPEN3D_ML_ROOT/requirements-tensorflow.txt"
python -W default -c \
python -W default -c \
"import open3d.ml.tf.ops; print('TensorFlow Ops library loaded:', open3d.ml.tf.ops)"
fi
if [ "$BUILD_TENSORFLOW_OPS" == ON ] && [ "$BUILD_PYTORCH_OPS" == ON ]; then
Expand Down

0 comments on commit 9c9d9d1

Please sign in to comment.