Skip to content

Commit

Permalink
remove unused ppc-scheduler
Browse files Browse the repository at this point in the history
  • Loading branch information
cyjseagull committed Oct 25, 2024
1 parent e9c5477 commit 0ebbbf1
Show file tree
Hide file tree
Showing 79 changed files with 61 additions and 3,504 deletions.
40 changes: 24 additions & 16 deletions .github/workflows/cpp_full_node_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ on:
push:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
pull_request:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
release:
Expand Down Expand Up @@ -62,24 +64,24 @@ jobs:
sudo apt install -y lcov ccache wget libgmp-dev python3-dev
export GCC='gcc-10'
export CXX='g++-10'
bash cpp/tools/install_depends.sh -o ubuntu
bash -x cpp/tools/install_depends.sh -o ubuntu
mkdir -p cpp/build && cd cpp/build && cmake -DTESTS=ON -DCOVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../ || cat /Users/runner/work/WeDPR-Component/WeDPR-Component/vcpkg/buildtrees/libhdfs3/config-x64-osx-dbg-err.log
- name: Build for macOS
if: runner.os == 'macOS'
run: |
bash -x cpp/tools/install_depends.sh -o macos
mkdir -p cpp/build && cd cpp/build && cmake -DTESTS=ON -DCOVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../
make -j3
- name: Test
if: runner.os != 'Windows'
run: |
cd cpp/build && CTEST_OUTPUT_ON_FAILURE=TRUE ctest
- name: Publish Error
if: always()
uses: actions/upload-artifact@v4
with:
name: config-x64-osx-dbg-err.log
path: /Users/runner/work/WeDPR-Component/WeDPR-Component/vcpkg/buildtrees/libhdfs3/config-x64-osx-dbg-err.log
name: config-x64-linux-dbg-err.log
path: /home/runner/work/WeDPR-Component/WeDPR-Component/vcpkg/buildtrees/libhdfs3/config-x64-linux-dbg-err.log
#- name: Test
# if: runner.os != 'Windows'
# run: |
# cd cpp/build && CTEST_OUTPUT_ON_FAILURE=TRUE ctest

build_centos:
name: build_centos full node
Expand Down Expand Up @@ -135,28 +137,34 @@ jobs:
run: |
bash cpp/tools/install_depends.sh -o centos
alias cmake='cmake3'
. /opt/rh/devtoolset-11/enable
. /opt/rh/devtoolset-11/enable
mkdir -p cpp/build
cd cpp/build
cmake3 -DCMAKE_BUILD_TYPE=Release -DTESTS=ON -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake ../
cmake3 --build . --parallel 3
- name: Test
run: |
export OMP_NUM_THREADS=1
cd build && CTEST_OUTPUT_ON_FAILURE=TRUE make test
- uses: actions/upload-artifact@v4
- name: Publish Error
if: always()
uses: actions/upload-artifact@v3
with:
name: vcpkg-manifest-install.log
path: /__w/WeDPR-Component/WeDPR-Component/cpp/build/vcpkg-manifest-install.log
#- name: Test
# run: |
# export OMP_NUM_THREADS=1
# cd build && CTEST_OUTPUT_ON_FAILURE=TRUE make test
- uses: actions/upload-artifact@v3
with:
name: ppc-air-node-centos-x64
path: ./cpp/build/bin/ppc-air-node
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ppc-pro-node-centos-x64
path: ./cpp/build/bin/ppc-pro-node
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ppc-gateway-service-centos-x64
path: ./cpp/build/bin/ppc-gateway-service
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: libppc-crypto-sdk-jni.so
path: ./cpp/wedpr-component-sdk/bindings/java/src/main/resources/META-INF/native/libppc-crypto-sdk-jni.so
2 changes: 2 additions & 0 deletions .github/workflows/cpp_sdk_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ on:
push:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
pull_request:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
release:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cpp_toolkit_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ on:
push:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
pull_request:
paths-ignore:
- "docs/**"
- "python/**"
- "Changelog.md"
- "README.md"
release:
Expand Down
25 changes: 24 additions & 1 deletion cpp/cmake/grpc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,29 @@ if(NOT GRPC_CPP_PLUGIN AND TARGET gRPC::grpc_cpp_plugin)
endif()
endif()


if(NOT GRPC_CPP_REFLECTION AND TARGET gRPC::grpc++_reflection)
get_target_property(GRPC_CPP_REFLECTION gRPC::grpc++_reflection
IMPORTED_LOCATION_RELEASE)
if(NOT EXISTS "${GRPC_CPP_REFLECTION}")
get_target_property(GRPC_CPP_REFLECTION gRPC::grpc++_reflection
IMPORTED_LOCATION_RELWITHDEBINFO)
endif()
if(NOT EXISTS "${GRPC_CPP_REFLECTION}")
get_target_property(GRPC_CPP_REFLECTION gRPC::grpc++_reflection
IMPORTED_LOCATION_MINSIZEREL)
endif()
if(NOT EXISTS "${GRPC_CPP_REFLECTION}")
get_target_property(GRPC_CPP_REFLECTION gRPC::grpc++_reflection
IMPORTED_LOCATION_DEBUG)
endif()
if(NOT EXISTS "${GRPC_CPP_REFLECTION}")
get_target_property(GRPC_CPP_REFLECTION gRPC::grpc++_reflection
IMPORTED_LOCATION_NOCONFIG)
endif()
endif()

set(PROTOC_BINARY ${Protobuf_PROTOC_EXECUTABLE})
message("# PROTOC_BINARY: ${Protobuf_PROTOC_EXECUTABLE}")
message("# GRPC_CPP_PLUGIN: ${GRPC_CPP_PLUGIN}")
message("# GRPC_CPP_PLUGIN: ${GRPC_CPP_PLUGIN}")
message("# GRPC_CPP_REFLECTION: ${GRPC_CPP_REFLECTION}")
2 changes: 1 addition & 1 deletion cpp/tools/install_depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ install_gsasl_depend()
fi
# ubuntu
if [[ "${os_type}" == "ubuntu" ]];then
cd libgsasl-1.8.0 && ./configure --with-pic --disable-ntlm --disable-gs2 --disable-gssapi --without-stringprep && make -j4 && make install
cd libgsasl-1.8.0 && ./configure --with-pic && make -j4 && make install
fi
LOG_INFO "download and install gsasl success..."
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/wedpr-computing/ppc-pir/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ target_include_directories(${TEST_BINARY_NAME} PRIVATE .)

# target_link_libraries(${TEST_BINARY_NAME} ${PIR_TARGET} ${RPC_TARGET} ${CRYPTO_TARGET} ${BOOST_UNIT_TEST})
target_link_libraries(${TEST_BINARY_NAME} PUBLIC ${IO_TARGET} ${FRONT_TARGET} ${BCOS_UTILITIES_TARGET} ${TARS_PROTOCOL_TARGET} ${PIR_TARGET} ${RPC_TARGET} ${CRYPTO_TARGET} ${PROTOCOL_TARGET} ${BOOST_UNIT_TEST})
add_test(NAME test-psi WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TEST_BINARY_NAME})
add_test(NAME test-pir WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${TEST_BINARY_NAME})
3 changes: 3 additions & 0 deletions cpp/wedpr-computing/ppc-pir/tests/data/AysPreDataset.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
id,x1
1,test
2,test2
2 changes: 1 addition & 1 deletion cpp/wedpr-protocol/grpc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ foreach(proto_file ${MESSAGES_PROTOS})
endforeach()

add_library(${SERVICE_PB_TARGET} ${GRPC_MESSAGES_SRCS})
target_link_libraries(${SERVICE_PB_TARGET} PUBLIC ${PB_PROTOCOL_TARGET} gRPC::grpc++_unsecure gRPC::grpc++_reflection)
target_link_libraries(${SERVICE_PB_TARGET} PUBLIC ${PB_PROTOCOL_TARGET} gRPC::grpc++_unsecure ${GRPC_CPP_REFLECTION})

add_subdirectory(client)
add_subdirectory(server)
2 changes: 1 addition & 1 deletion cpp/wedpr-protocol/protocol/src/JsonTaskImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void JsonTaskImpl::decodeDataResourceDesc(DataResourceDesc::Ptr _desc, Json::Val
BOOST_THROW_EXCEPTION(
InvalidParameter() << errinfo_comment("The \"..\" cannot be in the path"));
}
if (path.starts_with("/"))
if (path.rfind("/", 0) == 0)
{
_desc->setPath(path);
}
Expand Down
15 changes: 2 additions & 13 deletions cpp/wedpr-protocol/tars/TarsStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,11 @@
*/

#pragma once
#include <tup/Tars.h>
#include <concepts>
#include <string>

namespace ppctars::serialize
{
template <class TarsStructType>
concept TarsStruct = requires(TarsStructType tarsStruct)
{
{
tarsStruct.className()
}
->std::same_as<std::string>;
{
tarsStruct.MD5()
}
->std::same_as<std::string>;
tarsStruct.resetDefautlt();
};
concept TarsStruct = std::derived_from<TarsStructType, tars::TarsStructBase>;
} // namespace ppctars::serialize
Empty file removed python/ppc_scheduler/__init__.py
Empty file.
Empty file.
3 changes: 0 additions & 3 deletions python/ppc_scheduler/common/global_context.py

This file was deleted.

15 changes: 0 additions & 15 deletions python/ppc_scheduler/common/global_job_manager.py

This file was deleted.

72 changes: 0 additions & 72 deletions python/ppc_scheduler/common/initializer.py

This file was deleted.

78 changes: 0 additions & 78 deletions python/ppc_scheduler/common/log_utils.py

This file was deleted.

Loading

0 comments on commit 0ebbbf1

Please sign in to comment.