AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Break srvs. into rsmi & admin srvs. Add VerifyConnection api.

Browse Source 
Change-Id: I67567264c37e31f3409062a14e56eba4801cd944
This commit is contained in:
Chris Freehill
2019-12-22 20:30:58 -06:00
parent 5898345d17
commit dc6f6f3e9a
19 changed files with 316 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/CMakeLists.txt
+2 -1
View File
@@ -71,7 +71,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
"${PROTOB_OUT_DIR}" "${RSMI_INC_DIR}")
set(SERVER_SRC_LIST "${SRC_DIR}/rdc_rsmi_service.cc")
set(SERVER_SRC_LIST ${SERVER_SRC_LIST} "${SRC_DIR}/rdc_main.cc")
set(SERVER_SRC_LIST ${SERVER_SRC_LIST} "${SRC_DIR}/rdc_admin_service.cc")
set(SERVER_SRC_LIST ${SERVER_SRC_LIST} "${SRC_DIR}/rdc_server_main.cc")
set(SERVER_SRC_LIST ${SERVER_SRC_LIST} "${PROTOBUF_GENERATED_SRCS}")
message("SERVER_SRC_LIST=${SERVER_SRC_LIST}")
server/include/rdc/rdc_admin_service.h
Executable
+39
View File
@@ -0,0 +1,39 @@
/*
Copyright (c) 2019 - present Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef SERVER_INCLUDE_RDC_RDC_ADMIN_SERVICE_H_
#define SERVER_INCLUDE_RDC_RDC_ADMIN_SERVICE_H_
#include "rdc.grpc.pb.h" // NOLINT
#include "rocm_smi/rocm_smi.h"
#include "rdc/rdc_admin_service.h"
class RDCAdminServiceImpl final : public ::rdc::RdcAdmin::Service {
public:
RDCAdminServiceImpl();
~RDCAdminServiceImpl();
::grpc::Status VerifyConnection(::grpc::ServerContext* context,
const rdc::VerifyConnectionRequest* request,
rdc::VerifyConnectionResponse* reply) override;
private:
};
#endif // SERVER_INCLUDE_RDC_RDC_ADMIN_SERVICE_H_
server/include/rdc/rdc_rsmi_service.h
-4
View File
@@ -33,10 +33,6 @@ class RsmiServiceImpl final : public ::rdc::Rsmi::Service {
rsmi_status_t Initialize(uint64_t rsmi_init_flags = 0);
::grpc::Status VerifyConnection(::grpc::ServerContext* context,
const rdc::VerifyConnectionRequest* request,
rdc::VerifyConnectionResponse* reply) override;
::grpc::Status
GetNumDevices(::grpc::ServerContext* context,
const ::rdc::GetNumDevicesRequest* request,
server/include/rdc/rdc_main.h → server/include/rdc/rdc_server_main.h
+12 -4
View File
@@ -19,8 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef SERVER_INCLUDE_RDC_RDC_MAIN_H_
#define SERVER_INCLUDE_RDC_RDC_MAIN_H_
#ifndef SERVER_INCLUDE_RDC_RDC_SERVER_MAIN_H_
#define SERVER_INCLUDE_RDC_RDC_SERVER_MAIN_H_
#include <grpcpp/grpcpp.h>
@@ -28,6 +28,7 @@ THE SOFTWARE.
#include <memory>
#include "rdc/rdc_rsmi_service.h"
#include "rdc/rdc_admin_service.h"
class RDCServer {
public:
@@ -41,15 +42,22 @@ class RDCServer {
bool start_rsmi_service(void) const {return start_rsmi_service_;}
void set_start_rsmi_service(bool s) {start_rsmi_service_ = s;}
bool start_rdc_admin_service(void) const {return start_rdc_admin_service_;}
void set_start_rdc_admin_service(bool s) {start_rdc_admin_service_ = s;}
void ShutDown(void);
private:
void HandleSignal(int sig);
std::string server_address_;
bool start_rsmi_service_;
std::unique_ptr<::grpc::Server> server_;
bool start_rsmi_service_;
RsmiServiceImpl *rsmi_service_;
bool start_rdc_admin_service_;
RDCAdminServiceImpl *rdc_admin_service_;
};
#endif // SERVER_INCLUDE_RDC_RDC_MAIN_H_
#endif // SERVER_INCLUDE_RDC_RDC_SERVER_MAIN_H_
server/rdc.service
+1 -1
View File
@@ -7,7 +7,7 @@ Description=Radeon Data Center Daemon (rdcd)
After=network.target
# Add any services that must be started before rdcd here
#After=
#After=
# Add any non-service units required by rdcd here
#Requires=
server/src/rdc_admin_service.cc
Executable
+49
View File
@@ -0,0 +1,49 @@
/*
Copyright (c) 2019 - present Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <assert.h>
#include <grpcpp/grpcpp.h>
#include <unistd.h>
#include <iostream>
#include <sstream>
#include <memory>
#include <string>
#include <csignal>
#include "rdc.grpc.pb.h" // NOLINT
#include "rdc/rdc_admin_service.h"
RDCAdminServiceImpl::RDCAdminServiceImpl() {
}
RDCAdminServiceImpl::~RDCAdminServiceImpl() {
}
::grpc::Status
RDCAdminServiceImpl::VerifyConnection(::grpc::ServerContext* context,
const rdc::VerifyConnectionRequest* request,
rdc::VerifyConnectionResponse* reply) {
(void)context; // Quiet warning for now
reply->set_echo_magic_num(request->magic_num());
return ::grpc::Status::OK;
}
server/src/rdc_rsmi_service.cc
-9
View File
@@ -61,15 +61,6 @@ RsmiServiceImpl::Initialize(uint64_t rsmi_init_flags) {
}
return rsmi_ret;
}
::grpc::Status
RsmiServiceImpl::VerifyConnection(::grpc::ServerContext* context,
const rdc::VerifyConnectionRequest* request,
rdc::VerifyConnectionResponse* reply) {
(void)context; // Quiet warning for now
std::string prefix("Hello ");
reply->set_message(prefix + request->name());
return ::grpc::Status::OK;
}
::grpc::Status
RsmiServiceImpl::GetNumDevices(::grpc::ServerContext* context,
server/src/rdc_main.cc → server/src/rdc_server_main.cc
+13 -2
View File
@@ -36,7 +36,7 @@ THE SOFTWARE.
#include "rdc.grpc.pb.h" // NOLINT
#include "rocm_smi/rocm_smi.h"
#include "rdc/rdc_main.h"
#include "rdc/rdc_server_main.h"
#include "rdc/rdc_rsmi_service.h"
static bool sShutDownServer = false;
@@ -46,7 +46,7 @@ static const char *kRDCDHomeDir = "/";
static const char *kDaemonLockFile = "/var/run/rdcd.lock";
RDCServer::RDCServer() : server_address_("0.0.0.0:50051"),
rsmi_service_(nullptr) {
rsmi_service_(nullptr), rdc_admin_service_(nullptr) {
}
RDCServer::~RDCServer() {
@@ -66,6 +66,10 @@ RDCServer::Run() {
// Register services as the instances through which we'll communicate with
// clients. These are synchronous services.
if (start_rdc_admin_service()) {
rdc_admin_service_ = new RDCAdminServiceImpl();
builder.RegisterService(rdc_admin_service_);
}
if (start_rsmi_service()) {
rsmi_service_ = new RsmiServiceImpl();
@@ -125,6 +129,11 @@ RDCServer::ShutDown(void) {
delete rsmi_service_;
rsmi_service_ = nullptr;
}
if (rdc_admin_service_) {
delete rdc_admin_service_;
rdc_admin_service_ = nullptr;
}
}
static void * ProcessSignalLoop(void *server_ptr) {
@@ -268,6 +277,8 @@ int main(int argc, char** argv) {
// TODO(cfreehil): Eventually, set these by reading a config file
rdc_server.set_start_rsmi_service(true);
rdc_server.set_start_rdc_admin_service(true);
// rdc_server.set_secure_communications(false);
// rdc_server.set_address("0.0.0.0:50051")