Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove OpenGLCompute #8077

Merged
merged 6 commits into from
Feb 11, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ WITH_WEBASSEMBLY ?= $(findstring webassembly, $(LLVM_COMPONENTS))
WITH_AMDGPU ?= $(findstring amdgpu, $(LLVM_COMPONENTS))
WITH_OPENCL ?= not-empty
WITH_METAL ?= not-empty
WITH_OPENGLCOMPUTE ?= not-empty
WITH_D3D12 ?= not-empty
WITH_VULKAN ?= not-empty
WITH_SPIRV ?= not-empty
Expand Down Expand Up @@ -163,8 +162,6 @@ OPENCL_LLVM_CONFIG_LIB=$(if $(WITH_OPENCL), , )
METAL_CXX_FLAGS=$(if $(WITH_METAL), -DWITH_METAL, )
METAL_LLVM_CONFIG_LIB=$(if $(WITH_METAL), , )

OPENGLCOMPUTE_CXX_FLAGS=$(if $(WITH_OPENGLCOMPUTE), -DWITH_OPENGLCOMPUTE, )

D3D12_CXX_FLAGS=$(if $(WITH_D3D12), -DWITH_D3D12, )
D3D12_LLVM_CONFIG_LIB=$(if $(WITH_D3D12), , )

Expand Down Expand Up @@ -218,7 +215,6 @@ CXX_FLAGS += $(AARCH64_CXX_FLAGS)
CXX_FLAGS += $(X86_CXX_FLAGS)
CXX_FLAGS += $(OPENCL_CXX_FLAGS)
CXX_FLAGS += $(METAL_CXX_FLAGS)
CXX_FLAGS += $(OPENGLCOMPUTE_CXX_FLAGS)
CXX_FLAGS += $(D3D12_CXX_FLAGS)
CXX_FLAGS += $(WEBGPU_CXX_FLAGS)
CXX_FLAGS += $(POWERPC_CXX_FLAGS)
Expand Down Expand Up @@ -345,7 +341,6 @@ endif
ifneq ($(TEST_VULKAN), )
VULKAN_LD_FLAGS ?= -lvulkan
endif
OPENGL_LD_FLAGS ?= -lGL
HOST_OS=linux
endif

Expand All @@ -364,7 +359,6 @@ endif
ifneq ($(TEST_METAL), )
METAL_LD_FLAGS ?= -framework Metal -framework Foundation
endif
OPENGL_LD_FLAGS ?= -framework OpenGL
HOST_OS=os_x
endif

Expand Down Expand Up @@ -476,7 +470,6 @@ SOURCE_FILES = \
CodeGen_Metal_Dev.cpp \
CodeGen_OpenCL_Dev.cpp \
CodeGen_Vulkan_Dev.cpp \
CodeGen_OpenGLCompute_Dev.cpp \
CodeGen_Posix.cpp \
CodeGen_PowerPC.cpp \
CodeGen_PTX_Dev.cpp \
Expand Down Expand Up @@ -670,7 +663,6 @@ HEADER_FILES = \
CodeGen_Metal_Dev.h \
CodeGen_OpenCL_Dev.h \
CodeGen_Vulkan_Dev.h \
CodeGen_OpenGLCompute_Dev.h \
CodeGen_Posix.h \
CodeGen_PTX_Dev.h \
CodeGen_PyTorch.h \
Expand Down Expand Up @@ -854,13 +846,9 @@ RUNTIME_CPP_COMPONENTS = \
msan \
msan_stubs \
opencl \
opengl_egl_context \
opengl_glx_context \
openglcompute \
osx_clock \
osx_get_symbol \
osx_host_cpu_count \
osx_opengl_context \
osx_yield \
posix_aligned_alloc \
posix_allocator \
Expand Down Expand Up @@ -931,7 +919,6 @@ RUNTIME_EXPORTED_INCLUDES = $(INCLUDE_DIR)/HalideRuntime.h \
$(INCLUDE_DIR)/HalideRuntimeHexagonDma.h \
$(INCLUDE_DIR)/HalideRuntimeHexagonHost.h \
$(INCLUDE_DIR)/HalideRuntimeOpenCL.h \
$(INCLUDE_DIR)/HalideRuntimeOpenGLCompute.h \
$(INCLUDE_DIR)/HalideRuntimeMetal.h \
$(INCLUDE_DIR)/HalideRuntimeQurt.h \
$(INCLUDE_DIR)/HalideRuntimeVulkan.h \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ currently targets:

- CPU architectures: X86, ARM, Hexagon, PowerPC, RISC-V
- Operating systems: Linux, Windows, macOS, Android, iOS, Qualcomm QuRT
- GPU Compute APIs: CUDA, OpenCL, OpenGL Compute Shaders, Apple Metal, Microsoft
- GPU Compute APIs: CUDA, OpenCL, Apple Metal, Microsoft
Direct X 12, Vulkan

Rather than being a standalone programming language, Halide is embedded in C++.
Expand Down
18 changes: 0 additions & 18 deletions README_cmake.md
Original file line number Diff line number Diff line change
Expand Up @@ -500,23 +500,6 @@ If the CMake version is lower than 3.18, the deprecated [`FindCUDA`][findcuda]
module will be used instead. It reads the variable `CUDA_TOOLKIT_ROOT_DIR`
instead of `CUDAToolkit_ROOT` above.

TODO(https://github.com/halide/Halide/issues/5633): update this section for OpenGLCompute, which needs some (but maybe not all) of this.

When targeting OpenGL, the [`FindOpenGL`][findopengl] and [`FindX11`][findx11]
modules will be used to link AOT generated binaries. These modules can be
overridden by setting the following variables:

| Variable | Description |
|-------------------------|----------------------------------|
| `OPENGL_egl_LIBRARY` | Path to the EGL library. |
| `OPENGL_glu_LIBRARY` | Path to the GLU library. |
| `OPENGL_glx_LIBRARY` | Path to the GLVND GLX library. |
| `OPENGL_opengl_LIBRARY` | Path to the GLVND OpenGL library |
| `OPENGL_gl_LIBRARY` | Path to the OpenGL library. |

The OpenGL paths will need to be set if you intend to use OpenGL with X11 on
macOS.

Halide also searches for `libpng` and `libjpeg-turbo` through the
[`FindPNG`][findpng] and [`FindJPEG`][findjpeg] modules, respectively. They can
be overridden by setting the following variables.
Expand Down Expand Up @@ -1395,7 +1378,6 @@ guidelines you should follow when writing a new app.
[finddoxygen]: https://cmake.org/cmake/help/latest/module/FindDoxygen.html
[findjpeg]: https://cmake.org/cmake/help/latest/module/FindJPEG.html
[findopencl]: https://cmake.org/cmake/help/latest/module/FindOpenCL.html
[findopengl]: https://cmake.org/cmake/help/latest/module/FindOpenGL.html
[findpng]: https://cmake.org/cmake/help/latest/module/FindPNG.html
[findpython3]: https://cmake.org/cmake/help/latest/module/FindPython3.html
[findx11]: https://cmake.org/cmake/help/latest/module/FindX11.html
Expand Down
1 change: 0 additions & 1 deletion apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ add_app(max_filter)
add_app(nl_means)
# add_app(nn_ops) # TODO(#5374): missing CMake build
# add_app(onnx) # TODO(#5374): missing CMake build
# add_app(openglcompute) # TODO(#5374): missing CMake build
add_app(resize)
# add_app(resnet_50) # TODO(#5374): missing CMake build
# add_app(simd_op_check) # TODO(#5374): missing CMake build
Expand Down
22 changes: 0 additions & 22 deletions apps/openglcompute/AndroidManifest.xml

This file was deleted.

99 changes: 0 additions & 99 deletions apps/openglcompute/Makefile

This file was deleted.

9 changes: 0 additions & 9 deletions apps/openglcompute/build.sh

This file was deleted.

20 changes: 0 additions & 20 deletions apps/openglcompute/build.xml

This file was deleted.

69 changes: 0 additions & 69 deletions apps/openglcompute/jni/Android.mk

This file was deleted.

7 changes: 0 additions & 7 deletions apps/openglcompute/jni/Application.mk

This file was deleted.

Loading
Loading