Skip to content

Commit

Permalink
refactor(FW): Remove karathon bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
dgoeries committed Jun 17, 2024
1 parent 297d667 commit f1fddb4
Show file tree
Hide file tree
Showing 91 changed files with 343 additions and 13,948 deletions.
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ variables:
refs:
- merge_requests
changes:
- "src/karathon/**/*" # bound api old binding code
- "src/karabind/**/*" # bound api new binding code
- "src/karabo/**/*" # bound api depends on the c++ build
- "src/pythonKarabo/**/*"
Expand Down
2 changes: 1 addition & 1 deletion auto_build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ if [ -d $FRAMEWORK_INSTALL_DIR ]; then
done
fi

# Builds libkarabo, libkarathon, libkarabind, karabo-* utilities
# Builds libkarabo, libkarabind, karabo-* utilities
# and installs them in FRAMEWORK_INSTALL_DIR.
safeRunCommand $EXTERN_DEPS_DIR/bin/cmake --build . -j $NUM_JOBS --target install
if [ $? -ne 0 ]; then
Expand Down
4 changes: 1 addition & 3 deletions build/karabo/bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,12 @@ mkdir -p $PACKAGEDIR/var/data
cp -rf $EXTERN_DEPS_DIR $PACKAGEDIR/extern
rm -rf $PACKAGEDIR/extern/conan_toolchain

# karathon and karabind
# karabind
# Use karabo embedded python interpreter
PATH=$PACKAGEDIR/extern/bin:$PATH
SITE_PACKAGES=`python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`

cp -rf $PACKAGEDIR/lib/libkarathon.so $SITE_PACKAGES/karathon.so # <-- karathon.so
cp -rf $PACKAGEDIR/lib/libkarabind.so $SITE_PACKAGES/karabind.so # <-- karabind.so
# ln -s $SITE_PACKAGES/karathon.so $PACKAGEDIR/lib/libkarathon.so
[ -d $PACKAGEDIR/extern/include/python3.8m ] && (cd $PACKAGEDIR/extern/include; rm -f python3.8; ln -s python3.8m python3.8)

# deviceServer, brokerMessageLogger, idxview, idxbuild, brokerRates are
Expand Down
2 changes: 1 addition & 1 deletion ci/lint
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ __lint_clang_format() {

SCAN_DIRS="$CI_PROJECT_DIR/src/karabo $CI_PROJECT_DIR/src/brokerMessageLogger \
$CI_PROJECT_DIR/src/cppLongTests $CI_PROJECT_DIR/src/deviceServer \
$CI_PROJECT_DIR/src/integrationTests $CI_PROJECT_DIR/src/karathon \
$CI_PROJECT_DIR/src/integrationTests \
$CI_PROJECT_DIR/src/karabind $CI_PROJECT_DIR/src/tools"

echo "Linting format with `clang-format --version` ..."
Expand Down
10 changes: 0 additions & 10 deletions run_python_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,12 @@ safeRunTests() {
fi
export KARABO_BROKER=$BROKER

if [ "$USE_KARATHON" = "1" ]; then
BIND_MODE="Running tests with karathon"
else
BIND_MODE="Running tests with karabind"
fi
echo
echo "*************************************************************************************************"
echo "*************************************************************************************************"
echo "**"
echo "** Running Karabo Python ${TEST_SUITE_NAME} tests with ${BROKER_TYPE^^} broker ... ${KARABO_BROKER}"
echo "** Broker Topic is ${KARABO_BROKER_TOPIC}"
echo "** Python bindings: ${BIND_MODE}"
echo "**"
echo "*************************************************************************************************"
echo "*************************************************************************************************"
Expand Down Expand Up @@ -175,10 +169,6 @@ runPythonTestsCI() {
do
safeRunTests $BROKER $*
done
# On CI we run once with karathon
export USE_KARATHON="1"
safeRunTests $BROKER $*
unset USE_KARATHON
}

runPythonTests() {
Expand Down
6 changes: 1 addition & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE.
# The project that builds the various C++ components of the Karabo Framework:
# libkarabo, libkarathon, C++ device server, unit tests, integration tests,
# libkarabo, C++ device server, unit tests, integration tests,
# and karabo C++ utilities like BrokerMessageLogs, BrokerMessageRates, ...
#
# Variables that influence the configuration behavior and that should be
Expand Down Expand Up @@ -116,9 +116,6 @@ endif()
# is used.
add_subdirectory(karabo ${CMAKE_BINARY_DIR}/karabo)

# The build of the Karathon Library (used by the Bound Python API).
add_subdirectory(karathon ${CMAKE_BINARY_DIR}/karathon)

# The build of the Karabind Library (used by the Bound Python API).
add_subdirectory(karabind ${CMAKE_BINARY_DIR}/karabind)

Expand Down Expand Up @@ -171,7 +168,6 @@ if (BUILD_UNIT_TESTING OR BUILD_INTEGRATION_TESTING OR BUILD_LONG_RUN_TESTING)
"*/include/numpy/*" "${CMAKE_CURRENT_SOURCE_DIR}/tools/*"
"${CMAKE_CURRENT_SOURCE_DIR}/deviceServer/*"
"${CMAKE_CURRENT_SOURCE_DIR}/brokerMessageLogger/*"
"${CMAKE_CURRENT_SOURCE_DIR}/karathon/*"
"${CMAKE_CURRENT_SOURCE_DIR}/karabind/*"
"${CMAKE_CURRENT_SOURCE_DIR}/integrationTests/*"
"${CMAKE_CURRENT_SOURCE_DIR}/cppLongTests/*"
Expand Down
156 changes: 0 additions & 156 deletions src/karathon/AttributesNodeWrap.hh

This file was deleted.

Loading

0 comments on commit f1fddb4

Please sign in to comment.