Skip to content

Commit

Permalink
CI fixes + misc.
Browse files Browse the repository at this point in the history
  • Loading branch information
ssheorey committed Oct 16, 2024
1 parent 1a98853 commit 862a953
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ jobs:

env:
BUILD_CUDA_MODULE: OFF
# TensorFlow v2.16 does not support Python 3.8
BUILD_TENSORFLOW_OPS: ${{ matrix.python_version == '3.8' && 'OFF' || 'ON' }}
OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
steps:
- name: Checkout source code
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ubuntu-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ jobs:
uses: actions/checkout@v4
with:
repository: isl-org/Open3D-ML
ref: ss/python-3.12 # remove before merge
path: ${{ env.OPEN3D_ML_ROOT }}
- name: Download wheels
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/googletest/googletest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ FetchContent_Declare(
INSTALL_COMMAND ""
)

FetchContent_Populate(ext_googletest)
FetchContent_MakeAvailable(ext_googletest)
FetchContent_GetProperties(ext_googletest SOURCE_DIR GOOGLETEST_SOURCE_DIR)
2 changes: 1 addition & 1 deletion 3rdparty/qhull/qhull.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ FetchContent_Declare(
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/qhull"
)

FetchContent_Populate(ext_qhull)
FetchContent_MakeAvailable(ext_qhull)
FetchContent_GetProperties(ext_qhull SOURCE_DIR QHULL_SOURCE_DIR)
5 changes: 2 additions & 3 deletions cpp/apps/Open3DViewer/Open3DViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
using namespace open3d::visualization::app;

#if __APPLE__
// Open3DViewer_mac.mm
#else
#error Build Open3DViewer_mac.mm instead of Open3DViewer.cpp on Apple.
#endif // __APPLE__
int main(int argc, const char *argv[]) {
RunViewer(argc, argv);
return 0;
}
#endif // __APPLE__
10 changes: 2 additions & 8 deletions cpp/pybind/t/geometry/lineset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,16 @@ transformation as :math:`P = R(P) + t`)");
Args:
angle (float): The rotation angle in degree.
axis (open3d.core.Tensor): The rotation axis.
resolution (int): The resolution defines the number of intermediate sweeps
about the rotation axis.
translation (float): The translation along the rotation axis.
Returns:
A triangle mesh with the result of the sweep operation.
Example:
This code generates a spring from a single line::
import open3d as o3d
Expand All @@ -286,18 +282,16 @@ transformation as :math:`P = R(P) + t`)");
R"(Sweeps the line set along a direction vector.
Args:
vector (open3d.core.Tensor): The direction vector.
scale (float): Scalar factor which essentially scales the direction vector.
Returns:
A triangle mesh with the result of the sweep operation.
Example:
This code generates an L-shaped mesh::
import open3d as o3d
lines = o3d.t.geometry.LineSet([[1.0,0.0,0.0],[0,0,0],[0,0,1]], [[0,1],[1,2]])
Expand Down Expand Up @@ -326,7 +320,7 @@ matrices. Camera reference frame is shown with XYZ axes in RGB.
Example:
Draw a purple camera frame with XYZ axes in RGB.
Draw a purple camera frame with XYZ axes in RGB::
import open3d.core as o3c
from open3d.t.geometry import LineSet
Expand Down

0 comments on commit 862a953

Please sign in to comment.