You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by tq...@apache.org on 2025/02/17 16:01:16 UTC
(tvm) 05/09: remove opengl
This is an automated email from the ASF dual-hosted git repository.
tqchen pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 24a7f8a4c989acc37a2d3d2c236b50be64bca2c7
Author: Siyuan Feng <hz...@sjtu.edu.cn>
AuthorDate: Mon Feb 17 14:40:51 2025 +0800
remove opengl
---
cmake/config.cmake | 3 ---
docker/Dockerfile.demo_opencl | 8 ++------
golang/src/device.go | 7 -------
include/tvm/runtime/c_runtime_api.h | 4 +---
include/tvm/runtime/packed_func.h | 2 --
jvm/core/src/main/java/org/apache/tvm/Device.java | 2 +-
python/tvm/_ffi/runtime_ctypes.py | 2 --
src/tir/analysis/verify_memory.cc | 2 +-
tests/scripts/task_config_build_gpu.sh | 1 -
9 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/cmake/config.cmake b/cmake/config.cmake
index 856803898a..6345c0c061 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -114,9 +114,6 @@ set(USE_KHRONOS_SPIRV OFF)
# whether enable SPIRV_KHR_DOT_PRODUCT
set(USE_SPIRV_KHR_INTEGER_DOT_PRODUCT OFF)
-# Whether enable OpenGL runtime
-set(USE_OPENGL OFF)
-
# Whether enable RPC runtime
set(USE_RPC ON)
diff --git a/docker/Dockerfile.demo_opencl b/docker/Dockerfile.demo_opencl
index 52995496fd..f7f1ebe200 100644
--- a/docker/Dockerfile.demo_opencl
+++ b/docker/Dockerfile.demo_opencl
@@ -24,7 +24,7 @@ FROM ubuntu:22.04
COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear
RUN echo "Labelling this image"
-LABEL Description="Docker image for TVM built with OpenCL & OpenGL support"
+LABEL Description="Docker image for TVM built with OpenCL support"
RUN echo "Preparing to install dependencies"
RUN apt-get update
@@ -49,10 +49,6 @@ RUN echo "Installing OpenCL libraries"
RUN apt-install-and-clear -y libviennacl-dev mesa-opencl-icd ocl-icd-opencl-dev clinfo
RUN apt-install-and-clear -y libclblas-dev libclfft-dev libclsparse-dev
-RUN echo "Installing OpenGL libraries"
-RUN apt-install-and-clear -y libcogl-dev libegl1 libgles1 libglfw3-dev
-# libglew-dev
-
RUN echo "Upgrading dependencies"
RUN apt-get upgrade -y
@@ -70,7 +66,7 @@ ENV TVM_HOME="/usr/tvm"
ENV TVM_BUILD_DIR="${TVM_HOME}/build"
RUN mkdir -p ${TVM_BUILD_DIR} && \
cd ${TVM_BUILD_DIR} && \
- cmake .. -DUSE_BLAS=openblas -DUSE_LLVM=ON -DUSE_OPENCL=ON -DUSE_OPENGL=ON && \
+ cmake .. -DUSE_BLAS=openblas -DUSE_LLVM=ON -DUSE_OPENCL=ON && \
make -j6
RUN echo "Building Python package"
diff --git a/golang/src/device.go b/golang/src/device.go
index 1a40b77f49..2918cf6a0f 100644
--- a/golang/src/device.go
+++ b/golang/src/device.go
@@ -43,8 +43,6 @@ var KDLVPI = int32(C.kDLVPI)
var KDLROCM = int32(C.kDLROCM)
// KDLVulkan is golang enum correspond to TVM device type kDLVulkan.
var KDLVulkan = int32(C.kDLVulkan)
-// KOpenGL is golang enum correspond to TVM device type kOpenGL.
-var KOpenGL = int32(C.kOpenGL)
// KExtDev is golang enum correspond to TVM device type kDLExtDev.
var KExtDev = int32(C.kDLExtDev)
@@ -93,8 +91,3 @@ func ROCM(index int32) Device {
func Vulkan(index int32) Device {
return Device{KDLVulkan, index}
}
-
-// OpenGL returns the Device object for OpenGL target on given index
-func OpenGL(index int32) Device {
- return Device{KOpenGL, index}
-}
diff --git a/include/tvm/runtime/c_runtime_api.h b/include/tvm/runtime/c_runtime_api.h
index 00a7964230..277ac048ac 100644
--- a/include/tvm/runtime/c_runtime_api.h
+++ b/include/tvm/runtime/c_runtime_api.h
@@ -119,8 +119,7 @@ typedef enum {
// To help avoid accidental conflicts between `DLDeviceType`
// and this enumeration, start numbering the new enumerators
// a little higher than (currently) seems necessary.
- kOpenGL = 34,
- kDLMicroDev,
+ kDLMicroDev=35,
TVMDeviceExtType_End, // sentinel value
} TVMDeviceExtType;
@@ -147,7 +146,6 @@ static_assert(kDLOneAPI == 14, TVM_HARCODED_INTEGER_CHANGED_MSG);
static_assert(kDLWebGPU == 15, TVM_HARCODED_INTEGER_CHANGED_MSG);
static_assert(kDLHexagon == 16, TVM_HARCODED_INTEGER_CHANGED_MSG);
-static_assert(kOpenGL == 34, TVM_HARCODED_INTEGER_CHANGED_MSG);
static_assert(kDLMicroDev == 35, TVM_HARCODED_INTEGER_CHANGED_MSG);
#undef TVM_HARCODED_INTEGER_CHANGED_MSG
#endif
diff --git a/include/tvm/runtime/packed_func.h b/include/tvm/runtime/packed_func.h
index b7eca8be1e..9b31481b9d 100644
--- a/include/tvm/runtime/packed_func.h
+++ b/include/tvm/runtime/packed_func.h
@@ -1478,8 +1478,6 @@ inline const char* DLDeviceType2Str(int type) {
return "webgpu";
case kDLHexagon:
return "hexagon";
- case kOpenGL:
- return "opengl";
case kDLMicroDev:
return "microdev";
default:
diff --git a/jvm/core/src/main/java/org/apache/tvm/Device.java b/jvm/core/src/main/java/org/apache/tvm/Device.java
index edea0b75df..8390d88cb9 100644
--- a/jvm/core/src/main/java/org/apache/tvm/Device.java
+++ b/jvm/core/src/main/java/org/apache/tvm/Device.java
@@ -29,7 +29,7 @@ public class Device {
static final int kDLCPU = 1, kDLCUDA = 2, kDLCUDAHost = 3, kDLOpenCL = 4, kDLVulkan = 7,
kDLMetal = 8, kDLVPI = 9, kDLROCM = 10, kDLROCMHost = 11, kDLExtDev = 12,
kDLCUDAManaged = 13, kDLOneAPI = 14, kDLWebGPU = 15, kDLHexagon = 16,
- kOpenGL = 34, kDLMicroDev = 35;
+ kDLMicroDev = 35;
private static final Map<Integer, String> MASK2STR = new HashMap<Integer, String>();
private static final Map<String, Integer> STR2MASK = new HashMap<String, Integer>();
diff --git a/python/tvm/_ffi/runtime_ctypes.py b/python/tvm/_ffi/runtime_ctypes.py
index f3b02ed569..3b7e82430b 100644
--- a/python/tvm/_ffi/runtime_ctypes.py
+++ b/python/tvm/_ffi/runtime_ctypes.py
@@ -264,7 +264,6 @@ class Device(ctypes.Structure):
kDLOneAPI = 14
kDLWebGPU = 15
kDLHexagon = 16
- kOpenGL = 34
kDLMicroDev = 35
_fields_ = [("device_type", ctypes.c_int), ("device_id", ctypes.c_int)]
@@ -283,7 +282,6 @@ class Device(ctypes.Structure):
kDLOneAPI: "oneapi",
kDLWebGPU: "webgpu",
kDLHexagon: "hexagon",
- kOpenGL: "opengl",
kDLMicroDev: "microdev",
}
diff --git a/src/tir/analysis/verify_memory.cc b/src/tir/analysis/verify_memory.cc
index 4f9c3e5edd..e891824d79 100644
--- a/src/tir/analysis/verify_memory.cc
+++ b/src/tir/analysis/verify_memory.cc
@@ -150,7 +150,7 @@ class MemoryAccessVerifier final : protected StmtExprVisitor {
/// Check if a given DLDeviceType/TVMDeviceExtType value denotes GPU device.
static bool IsGPUDevice(int dev_type) {
return kDLCUDA == dev_type || kDLOpenCL == dev_type || kDLVulkan == dev_type ||
- kDLMetal == dev_type || kDLROCM == dev_type || kOpenGL == dev_type;
+ kDLMetal == dev_type || kDLROCM == dev_type;
}
private:
diff --git a/tests/scripts/task_config_build_gpu.sh b/tests/scripts/task_config_build_gpu.sh
index 2d5600c513..41a42676f1 100755
--- a/tests/scripts/task_config_build_gpu.sh
+++ b/tests/scripts/task_config_build_gpu.sh
@@ -27,7 +27,6 @@ echo set\(USE_CUBLAS ON\) >> config.cmake
echo set\(USE_CUDNN ON\) >> config.cmake
echo set\(USE_CUDA ON\) >> config.cmake
echo set\(USE_VULKAN ON\) >> config.cmake
-echo set\(USE_OPENGL ON\) >> config.cmake
echo set\(USE_OPENCL ON\) >> config.cmake
echo set\(USE_OPENCL_GTEST \"/googletest\"\) >> config.cmake
echo set\(USE_LLVM \"/usr/bin/llvm-config-15 --link-static\"\) >> config.cmake