Skip to content

Commit

Permalink
style, workflow fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ssheorey committed Jan 11, 2025
1 parent 1636f28 commit c85518d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
maximize_ubuntu_github_actions_build_space
- name: Docker build
run: |
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cpu-static
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
elif [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
docker/docker_build.sh cpu-static-release
elif [ "${{ matrix.BUILD_SHARED_LIBS }}" = "ON" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_build.sh cpu-shared
Expand All @@ -63,9 +63,9 @@ jobs:
fi
- name: Docker test
run: |
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_test.sh cpu-static
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
elif [ "${{ matrix.BUILD_SHARED_LIBS }}" = "OFF" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "OFF" ]; then
docker/docker_test.sh cpu-static-release
elif [ "${{ matrix.BUILD_SHARED_LIBS }}" = "ON" ] && [ "${{ matrix.MLOPS }}" = "OFF" ] && [ "${{ env.DEVELOPER_BUILD }}" = "ON" ]; then
docker/docker_test.sh cpu-shared
Expand Down
35 changes: 13 additions & 22 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,15 @@ def finalize_options(self):
install_requires += [line.strip() for line in f.readlines() if line]

entry_points = {
"console_scripts": [
"open3d = @PYPI_PACKAGE_NAME@.tools.cli:main",
]
"console_scripts": ["open3d = @PYPI_PACKAGE_NAME@.tools.cli:main",]
}
if sys.platform != "darwin": # Remove check when off main thread GUI works
entry_points.update(
{
"tensorboard_plugins": [
"Open3D = @PYPI_PACKAGE_NAME@.visualization.tensorboard_plugin"
".plugin:Open3DPlugin",
]
}
)
entry_points.update({
"tensorboard_plugins": [
"Open3D = @PYPI_PACKAGE_NAME@.visualization.tensorboard_plugin"
".plugin:Open3DPlugin",
]
})
classifiers = [
# https://pypi.org/pypi?%3Aaction=list_classifiers
"Development Status :: 3 - Alpha",
Expand Down Expand Up @@ -158,21 +154,16 @@ def finalize_options(self):
# open3d-cpu wheel for Linux x86_64
if "@BUILD_CUDA_MODULE@" == "ON":
classifiers.append("Environment :: GPU :: NVIDIA CUDA")
elif (
sys.platform.startswith("linux")
and platform.machine() in ("i386", "x86_64", "AMD64")
and "@BUILD_SYCL_MODULE@" == "OFF"
):
elif (sys.platform.startswith("linux") and
platform.machine() in ("i386", "x86_64", "AMD64") and
"@BUILD_SYCL_MODULE@" == "OFF"):
name += "-cpu"
long_description += (
"\n\nThis wheel only contains CPU functionality. "
"Use the open3d wheel for full functionality."
)
long_description += ("\n\nThis wheel only contains CPU functionality. "
"Use the open3d wheel for full functionality.")
elif "@BUILD_SYCL_MODULE@" == "ON":
name += "-xpu"
long_description += (
"\n\nThis wheel contains cross-platform GPU support through SYCL."
)
"\n\nThis wheel contains cross-platform GPU support through SYCL.")
classifiers.append("Environment :: GPU")

setup_args = dict(
Expand Down
3 changes: 2 additions & 1 deletion python/test/core/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@ def test_binary_ew_ops(dtype, device):
np.testing.assert_equal((a * b).cpu().numpy(),
np.array([8, 18, 32, 50, 72, 98]))
# SYCL FP64 emulation may have precision issue.
np.testing.assert_allclose((a / b).cpu().numpy(), np.array([2, 2, 2, 2, 2, 2]))
np.testing.assert_allclose((a / b).cpu().numpy(),
np.array([2, 2, 2, 2, 2, 2]))

a = o3c.Tensor(np.array([4, 6, 8, 10, 12, 14]), dtype=dtype, device=device)
a += b
Expand Down

0 comments on commit c85518d

Please sign in to comment.