Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "ocelot/hydrazine"]
path = ocelot/ThirdParty/hydrazine
url = https://github.com/gpuocelot/hydrazine.git
[submodule "ocelot/ThirdParty/res_embed"]
path = ocelot/ThirdParty/res_embed
url = https://github.com/dmikushin/res_embed.git
Expand Down
1 change: 0 additions & 1 deletion ocelot/ThirdParty/hydrazine
Submodule hydrazine deleted from 41b21f
26 changes: 26 additions & 0 deletions ocelot/ThirdParty/hydrazine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 2.8.12)

project(hydrazine CXX)

find_package(Boost COMPONENTS thread REQUIRED)
find_package(OpenGL REQUIRED)

file(GLOB SRCS "src/*.cpp")
add_library(${PROJECT_NAME} STATIC ${SRCS})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(${PROJECT_NAME} Boost::thread OpenGL::GL)

include(CTest)

file(GLOB TESTS "test/*.cpp")
foreach(TEST ${TESTS})
get_filename_component(TEST_WE ${TEST} NAME_WE)
set(TEST_NAME ${PROJECT_NAME}_${TEST_WE})
add_executable(${TEST_NAME} ${TEST})
target_include_directories(${TEST_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
set_property(TARGET ${TEST_NAME} PROPERTY CXX_STANDARD 11)
target_link_libraries(${TEST_NAME} ${PROJECT_NAME})
add_test(NAME ${TEST_NAME} COMMAND $<TARGET_FILE:${TEST_NAME}> -v)
endforeach()
38 changes: 38 additions & 0 deletions ocelot/ThirdParty/hydrazine/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Hydrazine

A utility library for GPUOcelot.

## Building

```
mkdir build
cd build
cmake ..
make -j8
```

## Testing

```
cd build
ctests
```

## Known issues

* `TestActiveTimer` deadlocks with `-v` verbose mode enabled
* `TestBTree` crashes

## Components

* **Threading**: A wrapper around pthreads providing a message passing interface rather than a locking based interface.
* **Argument Parser**: A parser for command line arguments.
* **B-Tree**: A replacement for std::map implementing the complete ISO/IEC 14882:2003 standard with a Btree relying on mmapped pages.
* **Debugging**: Conditional debugging messages as well as a more informative version of assert (assert.h).
* **Timer**: Interface to high precision linux timers as well as rdtsc timers on x86 processors.
* **Active Timer**: A wrapper around pthreads providing an asynchronous split-phase interface rather than a locking interface.
* **XML Parser**: Basic parser for XML.

## Original author

* Gregory Daimos
Loading
Loading