[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344506405
##
File path: src/common/util.h
##
@@ -61,6 +65,41 @@ inline int TVMPClose(FILE* stream) {
return pclose(stream);
#endif
}
+
+/*
+ * gnulib sys_wait.h.in says on Windows
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344506400
##
File path: apps/cpp_rpc/rpc_env.cc
##
@@ -164,8 +163,11 @@ void LinuxShared(const std::string output,
cmd += " " + *f;
}
cmd += " " + options;
-std::string executed_result = common::Execute(cmd);
-CHECK(executed_result.length() == 0) << executed_result;
+std::string err_msg;
+auto executed_status = common::Execute(cmd, err_msg);
+if (executed_status) {
+ LOG(ERROR) << err_msg;
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344478767
##
File path: apps/cpp_rpc/rpc_env.cc
##
@@ -0,0 +1,247 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file rpc_env.cc
+ * \brief Server environment of the RPC.
+ */
+#include
+#include
+#ifndef _MSC_VER
+#include
+#include
+#include
+#else
+#include
+#endif
+#include
+#include
+#include
+#include
+#include
+
+#include "rpc_env.h"
+#include "../../src/common/util.h"
+#include "../../src/runtime/file_util.h"
+
+namespace tvm {
+namespace runtime {
+
+RPCEnv::RPCEnv() {
+ #if defined(__linux__) || defined(__ANDROID__)
+base_ = "./rpc";
+mkdir(_[0], 0777);
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.workpath")
+.set_body([](TVMArgs args, TVMRetValue* rv) {
+static RPCEnv env;
+*rv = env.GetPath(args[0]);
+ });
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.load_module")
+.set_body([](TVMArgs args, TVMRetValue *rv) {
+static RPCEnv env;
+std::string file_name = env.GetPath(args[0]);
+*rv = Load(_name, "");
+LOG(INFO) << "Load module from " << file_name << " ...";
+ });
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+/*!
+ * \brief GetPath To get the workpath from packed function
+ * \param name The file name
+ * \return The full path of file.
+ */
+std::string RPCEnv::GetPath(std::string file_name) {
+ // we assume file_name has "/" means file_name is the exact path
+ // and does not create /.rpc/
+ if (file_name.find("/") != std::string::npos) {
+return file_name;
+ } else {
+return base_ + "/" + file_name;
+ }
+}
+/*!
+ * \brief Remove The RPC Environment cleanup function
+ */
+void RPCEnv::CleanUp() {
+ #if defined(__linux__) || defined(__ANDROID__)
+CleanDir(_[0]);
+int ret = rmdir(_[0]);
+if (ret != 0) {
+ LOG(WARNING) << "Remove directory " << base_ << " failed";
+}
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+
+/*!
+ * \brief ListDir get the list of files in a directory
+ * \param dirname The root directory name
+ * \return vector Files in directory.
+ */
+std::vector ListDir(const std::string ) {
+ std::vector vec;
+ #ifndef _MSC_VER
+DIR *dp = opendir(dirname.c_str());
+if (dp == NULL) {
+ int errsv = errno;
+ LOG(FATAL) << "ListDir " << dirname <<" error: " << strerror(errsv);
+}
+dirent *d;
+while ((d = readdir(dp)) != NULL) {
+ std::string filename = d->d_name;
+ if (filename != "." && filename != "..") {
+std::string f = dirname;
+if (f[f.length() - 1] != '/') {
+ f += '/';
+}
+f += d->d_name;
+vec.push_back(f);
+ }
+}
+closedir(dp);
+ #else
+WIN32_FIND_DATA fd;
+std::string pattern = dirname + "/*";
+HANDLE handle = FindFirstFile(pattern.c_str(), );
+if (handle == INVALID_HANDLE_VALUE) {
+ int errsv = GetLastError();
+ LOG(FATAL) << "ListDir " << dirname << " error: " << strerror(errsv);
+}
+do {
+ if (fd.cFileName != "." && fd.cFileName != "..") {
+std::string f = dirname;
+char clast = f[f.length() - 1];
+if (f == ".") {
+ f = fd.cFileName;
+} else if (clast != '/' && clast != '\\') {
+ f += '/';
+ f += fd.cFileName;
+}
+vec.push_back(f);
+ }
+} while (FindNextFile(handle, ));
+FindClose(handle);
+ #endif
+ return vec;
+}
+
+/*!
+ * \brief LinuxShared Creates a linux shared library
+ * \param output The output file name
+ * \param files The files for building
+ * \param options The compiler options
+ * \param cc The compiler
+ */
+void LinuxShared(const std::string output,
+ const std::vector ,
+ std::string options = "",
+ std::string cc = "g++") {
+std::string cmd = cc;
+cmd += " -shared -fPIC ";
+cmd += " -o " + output;
+for (auto f = files.begin(); f != files.end(); ++f) {
+ cmd += " " + *f;
+}
+cmd += " " + options;
+
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344478615
##
File path: src/runtime/rpc/rpc_session.h
##
@@ -36,8 +36,29 @@
namespace tvm {
namespace runtime {
+// Magic header for RPC data plane
const int kRPCMagic = 0xff271;
+// magic header for RPC tracker(control plane)
+const int kRPCTrackerMagic = 0x2f271;
+// sucess response
+const int kRPCSuccess = kRPCMagic + 0;
+// duplicate key in proxy
+const int kRPCDupicate = kRPCMagic + 1;
Review comment:
It is used for proxy mode. However, this PR doesn't implement proxy in fact,
so I remove related unnecessary code, currently work like our java standalone
server.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344457521
##
File path: apps/cpp_rpc/rpc_env.cc
##
@@ -0,0 +1,247 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file rpc_env.cc
+ * \brief Server environment of the RPC.
+ */
+#include
+#include
+#ifndef _MSC_VER
+#include
+#include
+#include
+#else
+#include
+#endif
+#include
+#include
+#include
+#include
+#include
+
+#include "rpc_env.h"
+#include "../../src/common/util.h"
+#include "../../src/runtime/file_util.h"
+
+namespace tvm {
+namespace runtime {
+
+RPCEnv::RPCEnv() {
+ #if defined(__linux__) || defined(__ANDROID__)
+base_ = "./rpc";
+mkdir(_[0], 0777);
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.workpath")
+.set_body([](TVMArgs args, TVMRetValue* rv) {
+static RPCEnv env;
+*rv = env.GetPath(args[0]);
+ });
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.load_module")
+.set_body([](TVMArgs args, TVMRetValue *rv) {
+static RPCEnv env;
+std::string file_name = env.GetPath(args[0]);
+*rv = Load(_name, "");
+LOG(INFO) << "Load module from " << file_name << " ...";
+ });
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+/*!
+ * \brief GetPath To get the workpath from packed function
+ * \param name The file name
+ * \return The full path of file.
+ */
+std::string RPCEnv::GetPath(std::string file_name) {
+ // we assume file_name has "/" means file_name is the exact path
+ // and does not create /.rpc/
+ if (file_name.find("/") != std::string::npos) {
+return file_name;
+ } else {
+return base_ + "/" + file_name;
+ }
+}
+/*!
+ * \brief Remove The RPC Environment cleanup function
+ */
+void RPCEnv::CleanUp() {
+ #if defined(__linux__) || defined(__ANDROID__)
+CleanDir(_[0]);
+int ret = rmdir(_[0]);
+if (ret != 0) {
+ LOG(WARNING) << "Remove directory " << base_ << " failed";
+}
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+
+/*!
+ * \brief ListDir get the list of files in a directory
+ * \param dirname The root directory name
+ * \return vector Files in directory.
+ */
+std::vector ListDir(const std::string ) {
+ std::vector vec;
+ #ifndef _MSC_VER
+DIR *dp = opendir(dirname.c_str());
+if (dp == NULL) {
+ int errsv = errno;
+ LOG(FATAL) << "ListDir " << dirname <<" error: " << strerror(errsv);
+}
+dirent *d;
+while ((d = readdir(dp)) != NULL) {
+ std::string filename = d->d_name;
+ if (filename != "." && filename != "..") {
+std::string f = dirname;
+if (f[f.length() - 1] != '/') {
+ f += '/';
+}
+f += d->d_name;
+vec.push_back(f);
+ }
+}
+closedir(dp);
+ #else
+WIN32_FIND_DATA fd;
+std::string pattern = dirname + "/*";
+HANDLE handle = FindFirstFile(pattern.c_str(), );
+if (handle == INVALID_HANDLE_VALUE) {
+ int errsv = GetLastError();
+ LOG(FATAL) << "ListDir " << dirname << " error: " << strerror(errsv);
+}
+do {
+ if (fd.cFileName != "." && fd.cFileName != "..") {
+std::string f = dirname;
+char clast = f[f.length() - 1];
+if (f == ".") {
+ f = fd.cFileName;
+} else if (clast != '/' && clast != '\\') {
+ f += '/';
+ f += fd.cFileName;
+}
+vec.push_back(f);
+ }
+} while (FindNextFile(handle, ));
+FindClose(handle);
+ #endif
+ return vec;
+}
+
+/*!
+ * \brief LinuxShared Creates a linux shared library
+ * \param output The output file name
+ * \param files The files for building
+ * \param options The compiler options
+ * \param cc The compiler
+ */
+void LinuxShared(const std::string output,
+ const std::vector ,
+ std::string options = "",
+ std::string cc = "g++") {
+std::string cmd = cc;
+cmd += " -shared -fPIC ";
+cmd += " -o " + output;
+for (auto f = files.begin(); f != files.end(); ++f) {
+ cmd += " " + *f;
+}
+cmd += " " + options;
+
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344457521
##
File path: apps/cpp_rpc/rpc_env.cc
##
@@ -0,0 +1,247 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file rpc_env.cc
+ * \brief Server environment of the RPC.
+ */
+#include
+#include
+#ifndef _MSC_VER
+#include
+#include
+#include
+#else
+#include
+#endif
+#include
+#include
+#include
+#include
+#include
+
+#include "rpc_env.h"
+#include "../../src/common/util.h"
+#include "../../src/runtime/file_util.h"
+
+namespace tvm {
+namespace runtime {
+
+RPCEnv::RPCEnv() {
+ #if defined(__linux__) || defined(__ANDROID__)
+base_ = "./rpc";
+mkdir(_[0], 0777);
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.workpath")
+.set_body([](TVMArgs args, TVMRetValue* rv) {
+static RPCEnv env;
+*rv = env.GetPath(args[0]);
+ });
+
+TVM_REGISTER_GLOBAL("tvm.rpc.server.load_module")
+.set_body([](TVMArgs args, TVMRetValue *rv) {
+static RPCEnv env;
+std::string file_name = env.GetPath(args[0]);
+*rv = Load(_name, "");
+LOG(INFO) << "Load module from " << file_name << " ...";
+ });
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+/*!
+ * \brief GetPath To get the workpath from packed function
+ * \param name The file name
+ * \return The full path of file.
+ */
+std::string RPCEnv::GetPath(std::string file_name) {
+ // we assume file_name has "/" means file_name is the exact path
+ // and does not create /.rpc/
+ if (file_name.find("/") != std::string::npos) {
+return file_name;
+ } else {
+return base_ + "/" + file_name;
+ }
+}
+/*!
+ * \brief Remove The RPC Environment cleanup function
+ */
+void RPCEnv::CleanUp() {
+ #if defined(__linux__) || defined(__ANDROID__)
+CleanDir(_[0]);
+int ret = rmdir(_[0]);
+if (ret != 0) {
+ LOG(WARNING) << "Remove directory " << base_ << " failed";
+}
+ #else
+LOG(FATAL) << "Only support RPC in linux environment";
+ #endif
+}
+
+/*!
+ * \brief ListDir get the list of files in a directory
+ * \param dirname The root directory name
+ * \return vector Files in directory.
+ */
+std::vector ListDir(const std::string ) {
+ std::vector vec;
+ #ifndef _MSC_VER
+DIR *dp = opendir(dirname.c_str());
+if (dp == NULL) {
+ int errsv = errno;
+ LOG(FATAL) << "ListDir " << dirname <<" error: " << strerror(errsv);
+}
+dirent *d;
+while ((d = readdir(dp)) != NULL) {
+ std::string filename = d->d_name;
+ if (filename != "." && filename != "..") {
+std::string f = dirname;
+if (f[f.length() - 1] != '/') {
+ f += '/';
+}
+f += d->d_name;
+vec.push_back(f);
+ }
+}
+closedir(dp);
+ #else
+WIN32_FIND_DATA fd;
+std::string pattern = dirname + "/*";
+HANDLE handle = FindFirstFile(pattern.c_str(), );
+if (handle == INVALID_HANDLE_VALUE) {
+ int errsv = GetLastError();
+ LOG(FATAL) << "ListDir " << dirname << " error: " << strerror(errsv);
+}
+do {
+ if (fd.cFileName != "." && fd.cFileName != "..") {
+std::string f = dirname;
+char clast = f[f.length() - 1];
+if (f == ".") {
+ f = fd.cFileName;
+} else if (clast != '/' && clast != '\\') {
+ f += '/';
+ f += fd.cFileName;
+}
+vec.push_back(f);
+ }
+} while (FindNextFile(handle, ));
+FindClose(handle);
+ #endif
+ return vec;
+}
+
+/*!
+ * \brief LinuxShared Creates a linux shared library
+ * \param output The output file name
+ * \param files The files for building
+ * \param options The compiler options
+ * \param cc The compiler
+ */
+void LinuxShared(const std::string output,
+ const std::vector ,
+ std::string options = "",
+ std::string cc = "g++") {
+std::string cmd = cc;
+cmd += " -shared -fPIC ";
+cmd += " -o " + output;
+for (auto f = files.begin(); f != files.end(); ++f) {
+ cmd += " " + *f;
+}
+cmd += " " + options;
+
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344347686
##
File path: apps/cpp_rpc/rpc_server.cc
##
@@ -0,0 +1,363 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * Copyright (c) 2019 by Contributors
+ * \file rpc_server.cc
+ * \brief RPC Server implementation.
+ */
+
+#include
+
+#if defined(__linux__) || defined(__ANDROID__)
+#include
+#include
+#endif
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "rpc_server.h"
+#include "rpc_env.h"
+#include "rpc_tracker_client.h"
+#include "../../src/runtime/rpc/rpc_session.h"
+#include "../../src/runtime/rpc/rpc_socket_impl.h"
+#include "../../src/common/socket.h"
+
+#if defined(__linux__) || defined(__ANDROID__)
+static pid_t waitpid_eintr(int *status) {
+ pid_t pid = 0;
+ while ((pid = waitpid(-1, status, 0)) == -1) {
+if (errno == EINTR) {
+ continue;
+} else {
+ perror("waitpid");
+ abort();
+}
+ }
+ return pid;
+}
+#endif
+
+namespace tvm {
+namespace runtime {
+
+/*!
+ * \brief RPCServer RPC Server class.
+ * \param host The hostname of the server, Default=0.0.0.0
Review comment:
These arguments will be used in other class functions, like Start /
ListenLoopProc and so on.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-tvm] FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++ RPC
FrozenGene commented on a change in pull request #4281: [RUTNIME] Support C++
RPC
URL: https://github.com/apache/incubator-tvm/pull/4281#discussion_r344347149
##
File path: apps/cpp_rpc/rpc_env.h
##
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * Copyright (c) 2019 by Contributors
+ * \file rpc_env.h
+ * \brief Server environment of the RPC.
+ */
+#ifndef TVM_APPS_CPP_RPC_ENV_H_
+#define TVM_APPS_CPP_RPC_ENV_H_
+
+#include
+#if defined(__linux__) || defined(__ANDROID__)
+#include
+#include
+#endif
+#include
+
+namespace tvm {
+namespace runtime {
+
+/*!
+ * \brief Load Load module from file
+ This function will automatically call
+ cc.create_shared if the path is in format .o or .tar
+ High level handling for .o and .tar file.
+ We support this to be consistent with RPC module load.
+ * \param file The input file
+ * \param file The format of file
+ * \return Module The loaded module
+ */
+Module Load(std::string *path, const std::string fmt = "");
+
+/*!
+ * \brief CleanDir Removes the files from the directory
+ * \param dirname THe name of the directory
+ */
+void CleanDir(const std::string );
+
+/*!
+ * \brief RPCEnv The RPC Environment parameters for c++ rpc server
+ */
+struct RPCEnv {
+ public:
+ /*!
+* \brief Constructor Init The RPC Environment initialize function
+*/
+ RPCEnv();
+ /*!
+ * \brief GetPath To get the workpath from packed function
+ * \param name The file name
+ * \return The full path of file.
+ */
+ std::string GetPath(const std::string& file_name);
+ /*!
+ * \brief Remove The RPC Environment cleanup function
+ */
+ void Remove();
+
+ /*!
+ * \base_ Holds the environment path.
+ */
+ std::string base_;
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
