Skip to content

Commit ce3432a

Browse files
ssheoreyCopilot
andcommitted
Remove arm64 conditionals in macOS CI, since no other platforms are supported now.
Install glslang in all 3 platforms. fix incomplete type error. Co-authored-by: Copilot <copilot@github.com>
1 parent 1b90638 commit ce3432a

9 files changed

Lines changed: 30 additions & 31 deletions

File tree

.github/workflows/macos.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,10 @@ jobs:
6363

6464
- name: Install dependencies
6565
run: |
66-
brew install ccache pkg-config libusb
67-
68-
if [[ ${{ runner.arch }} == "ARM64" ]]; then
69-
# Fix gfortran not found issue
70-
brew install gcc
71-
ln -s $(brew --prefix gcc)/bin/gfortran-* /usr/local/bin/gfortran
72-
fi
66+
brew install ccache pkg-config libusb glslang spirv-cross
67+
# Fix gfortran not found issue
68+
brew install gcc
69+
ln -s $(brew --prefix gcc)/bin/gfortran-* /usr/local/bin/gfortran
7370
7471
ccache -M 2G # See .github/workflows/readme.md for ccache strategy.
7572
- name: Config and build
@@ -188,11 +185,9 @@ jobs:
188185
install_python_dependencies
189186
190187
# Fix macos-14 arm64 runner image issues, see comments in MacOS job.
191-
if [[ ${{ runner.arch}} == "ARM64" ]]; then
192-
ln -s $(which gfortran-13) /usr/local/bin/gfortran
193-
fi
188+
ln -s $(which gfortran-13) /usr/local/bin/gfortran
194189
195-
brew install ccache
190+
brew install ccache glslang spirv-cross
196191
ccache -M 2G # See .github/workflows/readme.md for ccache strategy.
197192
198193
- name: Config and build wheel

.github/workflows/windows.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ jobs:
9292
echo "CUDA_PATH_V$CUDA_VER_ID=$CUDA_PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
9393
echo "$CUDA_PATH\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
9494
95+
- name: Install glslang via vcpkg
96+
run: |
97+
vcpkg install glslang[tools]:x64-windows
98+
# Write install path to GITHUB_PATH to persist for future steps
99+
$glslangBinPath = Join-Path $env:VCPKG_INSTALLATION_ROOT "installed\x64-windows\tools\glslang"
100+
$glslangBinPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
101+
95102
- name: Checkout source code
96103
uses: actions/checkout@v4
97104

@@ -276,6 +283,14 @@ jobs:
276283
BUILD_PYTORCH_OPS: 'ON'
277284

278285
steps:
286+
287+
- name: Install glslang via vcpkg
288+
run: |
289+
vcpkg install glslang[tools]:x64-windows
290+
# Write install path to GITHUB_PATH to persist for future steps
291+
$glslangBinPath = Join-Path $env:VCPKG_INSTALLATION_ROOT "installed\x64-windows\tools\glslang"
292+
$glslangBinPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
293+
279294
- name: Checkout source code
280295
uses: actions/checkout@v4
281296

cpp/open3d/visualization/gui/GLFWWindowSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ void GLFWWindowSystem::ResizeRenderer(OSWindow w,
553553
// moving the window between Retina and non-Retina displays (or the initial
554554
// window-show resize) leaves the layer at the wrong size, causing the
555555
// rendered content to appear only in the lower-left quarter on Retina.
556-
ResizeNativeWindow((GLFWwindow*)w);
556+
ResizeNativeWindow(static_cast<GLFWwindow*>(w));
557557
// We need to recreate the swap chain after resizing a window on macOS
558558
// otherwise things look very wrong. SwapChain does not need to be resized
559559
// on other platforms.
@@ -570,7 +570,7 @@ MenuBase* GLFWWindowSystem::CreateOSMenu() {
570570
}
571571

572572
void GLFWWindowSystem::SetClipboardText(OSWindow w, const char* text) {
573-
glfwSetClipboardString((GLFWwindow*)w, text);
573+
glfwSetClipboardString(static_cast<GLFWwindow*>(w), text);
574574
}
575575

576576
} // namespace gui

cpp/open3d/visualization/gui/Label.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Widget::DrawResult Label::Draw(const DrawContext& context) {
121121
if (!is_default_color) {
122122
ImGui::PushStyleColor(ImGuiCol_Text, colorToImgui(impl_->color_));
123123
}
124-
ImGui::PushFont((ImFont*)context.fonts.GetFont(impl_->font_id_));
124+
ImGui::PushFont(static_cast<ImFont*>(context.fonts.GetFont(impl_->font_id_)));
125125

126126
auto padding = ImGui::GetStyle().FramePadding;
127127
float wrapX = ImGui::GetCursorPos().x + frame.width - padding.x;
@@ -142,7 +142,7 @@ Widget::DrawResult Label::Draw(const DrawContext& context) {
142142
void Label::DrawOverlay(const DrawContext& context) const {
143143
const auto& frame = GetFrame();
144144
ImDrawList* draw_list = ImGui::GetForegroundDrawList();
145-
ImFont* font = (ImFont*)context.fonts.GetFont(impl_->font_id_);
145+
ImFont* font = static_cast<ImFont*>(context.fonts.GetFont(impl_->font_id_));
146146
const float font_size = font->FontSize;
147147
const bool is_default_color = (impl_->color_ == DEFAULT_COLOR);
148148
const ImU32 text_col = is_default_color ? ImGui::GetColorU32(ImGuiCol_Text)

cpp/open3d/visualization/rendering/filament/FilamentScene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "open3d/visualization/rendering/RendererHandle.h"
4242
#include "open3d/visualization/rendering/Scene.h"
4343
#include "open3d/visualization/rendering/filament/FilamentResourceManager.h"
44+
#include "open3d/visualization/rendering/gaussian_splat/GaussianSplatDataPacking.h"
4445

4546
/// @cond
4647
namespace filament {
@@ -63,7 +64,6 @@ class FilamentView;
6364
class GeometryBuffersBuilder;
6465
class Renderer;
6566
class View;
66-
struct GaussianSplatPackedAttrs;
6767

6868
// Contains renderable objects like geometry and lights
6969
// Can have multiple views

cpp/open3d/visualization/rendering/gaussian_splat/GaussianSplatVulkanBackend.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,14 @@ class GaussianSplatVulkanBackend final : public GaussianSplatRenderer::Backend {
9292
}
9393

9494
auto& vk_ctx = GaussianSplatVulkanInteropContext::GetInstance();
95-
bool use_vk = vk_ctx.IsValid() && vk_ctx.AreGLExtensionsReady();
9695

97-
if (use_vk) {
96+
if (vk_ctx.IsValid() && vk_ctx.AreGLExtensionsReady()) {
9897
SharedImageDesc color_img =
9998
vk_ctx.CreateSharedColorImage(width, height, "gs.color");
10099
if (!color_img.IsValid()) {
101100
utility::LogWarning(
102101
"GaussianSplatVulkan: shared color image failed; "
103102
"falling back to GL textures");
104-
use_vk = false;
105103
} else {
106104
SharedImageDesc depth_img = vk_ctx.CreateSharedDepthImage(
107105
width, height, "gs.scene_depth");
@@ -110,7 +108,6 @@ class GaussianSplatVulkanBackend final : public GaussianSplatRenderer::Backend {
110108
utility::LogWarning(
111109
"GaussianSplatVulkan: shared depth image failed; "
112110
"falling back to GL textures");
113-
use_vk = false;
114111
} else {
115112
targets.color_gl_handle = color_img.gl_texture;
116113
targets.color_vk_image = reinterpret_cast<std::uintptr_t>(

examples/cpp/TICPSequential.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -358,36 +358,26 @@ class ExampleWindow : public ReconstructionWindow {
358358
} else if (name == "visualization") {
359359
visualize = value;
360360
} else if (name == "start_index") {
361-
std::istringstream is(value);
362361
start_index_ = std::stoi(value);
363362
} else if (name == "end_index") {
364-
std::istringstream is(value);
365363
end_index_ = std::stoi(value);
366364
} else if (name == "registration_method") {
367365
registration_method_ = value;
368366
} else if (name == "criteria.relative_fitness") {
369-
std::istringstream is(value);
370367
relative_fitness.push_back(std::stod(value));
371368
} else if (name == "criteria.relative_rmse") {
372-
std::istringstream is(value);
373369
relative_rmse.push_back(std::stod(value));
374370
} else if (name == "criteria.max_iterations") {
375-
std::istringstream is(value);
376371
max_iterations.push_back(std::stoi(value));
377372
} else if (name == "voxel_size") {
378-
std::istringstream is(value);
379373
voxel_sizes_.push_back(std::stod(value));
380374
} else if (name == "search_radii") {
381-
std::istringstream is(value);
382375
search_radius_.push_back(std::stod(value));
383376
} else if (name == "verbosity") {
384-
std::istringstream is(value);
385377
verb = value;
386378
} else if (name == "visualization_min") {
387-
std::istringstream is(value);
388379
min_visualization_scalar_ = std::stod(value);
389380
} else if (name == "visualization_max") {
390-
std::istringstream is(value);
391381
max_visualization_scalar_ = std::stod(value);
392382
}
393383
}

examples/python/visualization/draw_from_csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ----------------------------------------------------------------------------
22
# - Open3D: www.open3d.org -
33
# ----------------------------------------------------------------------------
4-
# Copyright (c) 2018-2026 www.open3d.org
4+
# Copyright (c) 2018-2024 www.open3d.org
55
# SPDX-License-Identifier: MIT
66
# ----------------------------------------------------------------------------
77
"""

util/install_deps_ubuntu.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ deps=(
2727
libc++abi-dev
2828
libsdl2-dev
2929
libxi-dev
30+
# Compute shaders
31+
glslang-tools
3032
# ML
3133
libtbb-dev
3234
# Headless rendering

0 commit comments

Comments
 (0)