Skip to content

Commit

Permalink
Brayns 247 remove circuit info. (#1116)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrien4193 committed Nov 16, 2022
1 parent ab2704b commit 3608a8d
Show file tree
Hide file tree
Showing 36 changed files with 7 additions and 1,601 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.viz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ubuntu-cpp-build:
stage: test
variables:
APT_PACKAGES: git libhdf5-serial-dev libtbb-dev pkg-config wget ca-certificates libssl-dev libwebsockets-dev libboost-all-dev zlib1g-dev libbz2-dev python3.9
CMAKE_ARGS: -DCMAKE_PREFIX_PATH=/app/dist -DBRAYNS_CIRCUITEXPLORER_ENABLED=ON -DBRAYNS_CIRCUITINFO_ENABLED=ON -DBRAYNS_DTI_ENABLED=ON -DBRAYNS_ATLASEXPLORER_ENABLED=ON -DBRAYNS_CYLINDRICCAMERA_ENABLED=ON -DBRAYNS_MOLECULEEXPLORER_ENABLED=ON -DPython3_EXECUTABLE=/usr/bin/python3.9 -DISPC_EXECUTABLE=/app/ispc-v1.18.0-linux/bin/ispc
CMAKE_ARGS: -DCMAKE_PREFIX_PATH=/app/dist -DBRAYNS_CIRCUITEXPLORER_ENABLED=ON -DBRAYNS_DTI_ENABLED=ON -DBRAYNS_ATLASEXPLORER_ENABLED=ON -DBRAYNS_CYLINDRICCAMERA_ENABLED=ON -DBRAYNS_MOLECULEEXPLORER_ENABLED=ON -DPython3_EXECUTABLE=/usr/bin/python3.9 -DISPC_EXECUTABLE=/app/ispc-v1.18.0-linux/bin/ispc
KUBERNETES_CPU_LIMIT: 5
KUBERNETES_CPU_REQUEST: 5
KUBERNETES_MEMORY_LIMIT: 8Gi
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
option(BRAYNS_TESTS_ENABLED "Activate unit testing" ON)
option(BRAYNS_SERVICE_ENABLED "Activate Brayns Service" ON)
option(BRAYNS_CIRCUITEXPLORER_ENABLED "Activate CircuitExplorer plugin" OFF)
option(BRAYNS_CIRCUITINFO_ENABLED "Activate CircuitInfo plugin" OFF)
option(BRAYNS_DTI_ENABLED "Activate Diffusion-Transfer Imaging plugin" OFF)
option(BRAYNS_ATLASEXPLORER_ENABLED "Activate Atlas explorer plugin" OFF)
option(BRAYNS_CYLINDRICCAMERA_ENABLED "Activate Cylindric projection camera" OFF)
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ RUN cd ${BRAYNS_SRC} \
&& CMAKE_PREFIX_PATH=${DIST_PATH}:${DIST_PATH}/lib/cmake/libwebsockets \
cmake .. \
-DBRAYNS_CIRCUITEXPLORER_ENABLED=ON \
-DBRAYNS_CIRCUITINFO_ENABLED=ON \
-DBRAYNS_DTI_ENABLED=ON \
-DBRAYNS_ATLASEXPLORER_ENABLED=ON \
-DBRAYNS_CYLINDRICCAMERA_ENABLED=ON \
Expand Down Expand Up @@ -218,4 +217,4 @@ EXPOSE 8200
# See https://docs.docker.com/engine/reference/run/#entrypoint-default-command-to-execute-at-runtime
# for more docs
ENTRYPOINT ["braynsService"]
CMD ["--uri", "0.0.0.0:8200", "--plugin", "braynsCircuitExplorer", "--plugin", "braynsCircuitInfo"]
CMD ["--uri", "0.0.0.0:8200", "--plugin", "braynsCircuitExplorer"]
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Brayns counts with a main application for its usage:
Brayns also comes with some already-made plugins:

* **CircuitExplorer**: The main plugin used at BBP. Allows for neuronal circuit visualization and simulation rendering.
* **CircuitInfo (Deprecated)**: A plugin which accepts queries to extract information from neuronal circuits.
* **DTI**: A diffuse-tensor imaging visualization plugin.
* **AtlasExplorer**: A plugin capable of interpreting and render NRRD volumes.
* **CylindricCamera**: A plugin that adds a cylindric camera projection for inmersive environments.
Expand Down Expand Up @@ -71,7 +70,6 @@ The following cmake options (shown with their default value) can be used during
* **BRAYNS_TESTS_ENABLED** (Default ON) - Activate unit tests
* **BRAYNS_SERVICE_ENABLED** (Default ON) - Activate braynsService app
* **BRAYNS_CIRCUITEXPLORER_ENABLED** (Default ON) - Activate CircuitExplorer plugin
* **BRAYNS_CIRCUITINFO_ENABLED** (Default OFF) - Activate CircuitInfo plugin
* **BRAYNS_DTI_ENABLED** (Default OFF) - Activate Diffusion-Tensor Imaging plugin
* **BRAYNS_ATLASEXPLORER_ENABLED** - (Default OFF) Activate AtlasExplorer plugin
* **BRAYNS_CYLINDIRCCAMERA_ENABLED** - (Default OFF) Activate Cylindric Camera projection plugin
Expand All @@ -92,7 +90,7 @@ The ***--uri*** parameter allows to specify an address and a port to bind to. In

This command will launch the braynsService app with only core functionality. To also add the functionality of any plugin, the ***--plugin*** option can be used to load plugins:

$ braynsService --uri 0.0.0.0:5000 --plugin braynsCircuitExplorer --plugin braynsCircuitInfo
$ braynsService --uri 0.0.0.0:5000 --plugin braynsCircuitExplorer --plugin braynsMoleculeExplorer

The name that must be used when specifying a plugin will depend on the name of the library of the plugin (stripping the extension **.so** from it)

Expand Down
6 changes: 1 addition & 5 deletions plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# This file is part of Brayns <https://github.com/BlueBrain/Brayns>

# Brion is needed for 3 plugin
if(BRAYNS_CIRCUITEXPLORER_ENABLED OR BRAYNS_CIRCUITINFO_ENABLED OR BRAYNS_DTI_ENABLED)
if(BRAYNS_CIRCUITEXPLORER_ENABLED OR BRAYNS_DTI_ENABLED)
find_package(HDF5 REQUIRED)
find_package(Brion QUIET)
endif()
Expand Down Expand Up @@ -41,10 +41,6 @@ if(BRAYNS_DTI_ENABLED)
add_subdirectory(DTI)
endif()

if(BRAYNS_CIRCUITINFO_ENABLED)
add_subdirectory(CircuitInfo)
endif()

if(BRAYNS_ATLASEXPLORER_ENABLED)
add_subdirectory(AtlasExplorer)
endif()
Expand Down
35 changes: 0 additions & 35 deletions plugins/CircuitInfo/CMakeLists.txt

This file was deleted.

67 changes: 0 additions & 67 deletions plugins/CircuitInfo/CircuitInfoPlugin.cpp

This file was deleted.

36 changes: 0 additions & 36 deletions plugins/CircuitInfo/CircuitInfoPlugin.h

This file was deleted.

81 changes: 0 additions & 81 deletions plugins/CircuitInfo/entrypoints/CIGetAfferentCellIdsEntrypoint.h

This file was deleted.

0 comments on commit 3608a8d

Please sign in to comment.