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.

Sign up for GitHub

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

OpenGL backend (stage 1) #535

Merged
merged 19 commits into from
Feb 27, 2020
Merged

OpenGL backend (stage 1) #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b1d27b9
[skip ci] basic start up for opengl
archibate Feb 17, 2020
f4e7fe5
[skip ci] use a struct_metal style struct compiler
archibate Feb 19, 2020
1f79fc1
[skip ci] basic allocator
archibate Feb 19, 2020
ef922ce
[skip ci] basic read/write tensor
archibate Feb 19, 2020
b7594bd
adding f32&f64 support for opengl
archibate Feb 20, 2020
ce00545
Update TaichiCore.cmake for TI_WITH_OPENGL
archibate Feb 26, 2020
9e68286
Update test_abs.py
yuanming-hu Feb 26, 2020
aeb2543
merge g1 with master fix: x86_64 -> x64
archibate Feb 26, 2020
ea41c2a
replace opengl_unary_op_type_symbol with unary_op_type_name
archibate Feb 26, 2020
b2acaa9
snode_io_arch -> snode_accessor_arch
archibate Feb 26, 2020
2ebf348
use GLEW_LIBRARY_DIR
archibate Feb 26, 2020
2132928
no more USE_GLEW macro
archibate Feb 26, 2020
d8457b5
no more mallocs in SSBO
archibate Feb 26, 2020
4adaaac
remove opengl_backend.py, add comment in mpm99 for ti.opengl
archibate Feb 26, 2020
c22ca77
fix memory leakage using std::vector
archibate Feb 27, 2020
99725de
better cmake: find GLFW and glfw3
archibate Feb 27, 2020
724781c
merge g1 with master
archibate Feb 27, 2020
4ee3102
support arch: uncomment with_opengl
archibate Feb 27, 2020
b0a8886
initialize_opengl in materialize_layout
archibate Feb 27, 2020
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
25 changes: 25 additions & 0 deletions cmake/TaichiCore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ endif()

option(USE_STDCPP "Use -stdlib=libc++" OFF)
option(TI_WITH_CUDA "Build with CUDA support" OFF)
option(TI_WITH_OPENGL "Build with OpenGL backend" ON)
option(GLEW_USE_STATIC_LIBS OFF)

include_directories(${CMAKE_SOURCE_DIR})
include_directories(external/xxhash)
Expand Down Expand Up @@ -53,6 +55,29 @@ if (TI_WITH_CUDA)
endif()
endif()

if (TI_WITH_OPENGL)
if(NOT GLEW_VERSION)
set(GLEW_VERSION 2.0.0)
endif()
find_package(GLEW ${GLEW_VERSION})
if (GLEW_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_OPENGL")
message("Building with GLEW ${GLEW_VERSION}")
message("Using GLEW: ${GLEW_LIBRARIES}")
target_include_directories(${LIBRARY_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
target_link_libraries(${LIBRARY_NAME} ${GLEW_LIBRARIES} GLEW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGLEW_STATIC")
find_package(glfw3 REQUIRED)
if (NOT glfw3_FOUND)
message(FATAL_ERROR "glfw3 not found.")
endif()
message("Building with glfw ${glfw3_VERSION}")
target_link_libraries(${LIBRARY_NAME} glfw)
else()
message(WARNING "GLEW not found, ignoring TI_WITH_OPENGL.")
endif()
endif()

# http://llvm.org/docs/CMake.html#embedding-llvm-in-your-project
find_package(LLVM REQUIRED CONFIG 8.0)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
Expand Down
2 changes: 1 addition & 1 deletion examples/mpm99.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import taichi as ti
ti.init(arch=ti.cuda) # Try to run on GPU
ti.init(arch=ti.cuda) # Try to run on GPU. Use arch=ti.opengl on old GPUs
quality = 1 # Use a larger value for higher-res simulations
n_particles, n_grid = 9000 * quality ** 2, 128 * quality
dx, inv_dx = 1 / n_grid, float(n_grid)
Expand Down
3 changes: 3 additions & 0 deletions python/taichi/lang/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
x64 = core.x64
cuda = core.cuda
metal = core.metal
opengl = core.opengl
profiler_print = lambda: core.get_current_program().profiler_print()
profiler_clear = lambda: core.get_current_program().profiler_clear()
profiler_start = lambda n: core.get_current_program().profiler_start(n)
Expand Down Expand Up @@ -222,6 +223,8 @@ def supported_archs():
archs.append(cuda)
if ti.core.with_metal():
archs.append(metal)
if ti.core.with_opengl():
archs.append(opengl)
return archs

class _ArchCheckers(object):
Expand Down
Loading