Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update protobuf #1013

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Update protobuf #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a8c87ad
init PR
sotetsuk Oct 28, 2021
8091b1a
add comments
sotetsuk Oct 28, 2021
2255196
Update mjxproto
github-actions[bot] Oct 28, 2021
fd0994f
[proto] TakeAction -> Act
sotetsuk Oct 28, 2021
e477ad2
fix cpp for Act
sotetsuk Oct 28, 2021
eab2383
Update mjxproto
github-actions[bot] Oct 28, 2021
bd97726
Apply formatter
github-actions[bot] Oct 28, 2021
e16773c
fix typo
sotetsuk Oct 28, 2021
3156f0b
[proto] ACTION_TYPE_NO => ACTION_TYPE_PASS
sotetsuk Oct 28, 2021
e0652b4
fix ACTION_TYPE_NO => ACTION_TYPE_PASS
sotetsuk Oct 28, 2021
18c2abb
Update mjxproto
github-actions[bot] Oct 28, 2021
5c64383
run check
sotetsuk Oct 28, 2021
1bbc104
[proto] draw_history => draws
sotetsuk Oct 28, 2021
74f705e
fix draw_history => draws
sotetsuk Oct 28, 2021
dac44d6
Update mjxproto
github-actions[bot] Oct 28, 2021
aa524a8
Apply formatter
github-actions[bot] Oct 28, 2021
a286342
run check
sotetsuk Oct 28, 2021
66cac85
[proto] NoWinner => draw
sotetsuk Oct 28, 2021
f2a2046
fix no_winner => draw
sotetsuk Oct 28, 2021
ed702fd
Update mjxproto
github-actions[bot] Oct 28, 2021
b5b6a43
Apply formatter
github-actions[bot] Oct 28, 2021
7dd66cc
run check
sotetsuk Oct 28, 2021
62b6f18
sed noWinner => draw
sotetsuk Oct 28, 2021
466987a
fix noWinner => draw
sotetsuk Oct 28, 2021
df350b5
sed drawHistory => draws
sotetsuk Oct 28, 2021
5a2ea85
fix typo
sotetsuk Oct 28, 2021
e053005
reorder action items
sotetsuk Oct 28, 2021
3b1b422
fix Action
sotetsuk Oct 28, 2021
a6746ff
Update mjxproto
github-actions[bot] Oct 28, 2021
77543da
remove stderr
sotetsuk Oct 28, 2021
3a3dd26
remove gameId
sotetsuk Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/mjx/agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Action GrpcAgent::Act(const Observation& observation) const noexcept {
const mjxproto::Observation& request = observation.proto();
mjxproto::Action response;
grpc::ClientContext context;
grpc::Status status = stub_->TakeAction(&context, request, &response);
grpc::Status status = stub_->Act(&context, request, &response);
assert(status.ok());
return Action(response);
}
Expand All @@ -126,9 +126,9 @@ AgentBatchGrpcServerImpl::AgentBatchGrpcServerImpl(

AgentBatchGrpcServerImpl::~AgentBatchGrpcServerImpl() {}

grpc::Status AgentBatchGrpcServerImpl::TakeAction(
grpc::ServerContext* context, const mjxproto::Observation* request,
mjxproto::Action* reply) {
grpc::Status AgentBatchGrpcServerImpl::Act(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) {
// Observationデータ追加
auto id = boost::uuids::random_generator()();
{
Expand Down
6 changes: 3 additions & 3 deletions include/mjx/agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ class AgentBatchGrpcServerImpl final : public mjxproto::Agent::Service {
std::unordered_map<boost::uuids::uuid, mjx::Action,
boost::hash<boost::uuids::uuid>>& act_map);
~AgentBatchGrpcServerImpl() final;
grpc::Status TakeAction(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;
grpc::Status Act(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;

std::mutex& mtx_que_;
std::mutex& mtx_map_;
Expand Down
16 changes: 3 additions & 13 deletions include/mjx/internal/action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace mjx::internal {
mjxproto::Action Action::CreateDiscard(AbsolutePos who, Tile discard,
std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_DISCARD);
proto.set_who(ToUType(who));
proto.set_tile(discard.Id());
Expand All @@ -18,7 +17,6 @@ mjxproto::Action Action::CreateDiscard(AbsolutePos who, Tile discard,
mjxproto::Action Action::CreateTsumogiri(AbsolutePos who, Tile discard,
std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_TSUMOGIRI);
proto.set_who(ToUType(who));
proto.set_tile(discard.Id());
Expand Down Expand Up @@ -54,7 +52,6 @@ std::vector<mjxproto::Action> Action::CreateDiscardsAndTsumogiri(

mjxproto::Action Action::CreateRiichi(AbsolutePos who, std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_RIICHI);
proto.set_who(ToUType(who));
Assert(IsValid(proto));
Expand All @@ -64,7 +61,6 @@ mjxproto::Action Action::CreateRiichi(AbsolutePos who, std::string game_id) {
mjxproto::Action Action::CreateTsumo(AbsolutePos who, Tile tile,
std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_TSUMO);
proto.set_who(ToUType(who));
proto.set_tile((tile.Id()));
Expand All @@ -75,7 +71,6 @@ mjxproto::Action Action::CreateTsumo(AbsolutePos who, Tile tile,
mjxproto::Action Action::CreateRon(AbsolutePos who, Tile tile,
std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_RON);
proto.set_who(ToUType(who));
proto.set_tile((tile.Id()));
Expand All @@ -86,7 +81,6 @@ mjxproto::Action Action::CreateRon(AbsolutePos who, Tile tile,
mjxproto::Action Action::CreateOpen(AbsolutePos who, Open open,
std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_who(ToUType(who));
proto.set_type(OpenTypeToActionType(open.Type()));
proto.set_open(open.GetBits());
Expand All @@ -96,16 +90,14 @@ mjxproto::Action Action::CreateOpen(AbsolutePos who, Open open,

mjxproto::Action Action::CreateNo(AbsolutePos who, std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_NO);
proto.set_type(mjxproto::ACTION_TYPE_PASS);
proto.set_who(ToUType(who));
Assert(IsValid(proto));
return proto;
}

mjxproto::Action Action::CreateNineTiles(AbsolutePos who, std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_type(mjxproto::ACTION_TYPE_ABORTIVE_DRAW_NINE_TERMINALS);
proto.set_who(ToUType(who));
Assert(IsValid(proto));
Expand All @@ -114,7 +106,6 @@ mjxproto::Action Action::CreateNineTiles(AbsolutePos who, std::string game_id) {

mjxproto::Action Action::CreateDummy(AbsolutePos who, std::string game_id) {
mjxproto::Action proto;
proto.set_game_id(game_id);
proto.set_who(static_cast<int>(who));
proto.set_type(mjxproto::ACTION_TYPE_DUMMY);
Assert(IsValid(proto));
Expand Down Expand Up @@ -142,7 +133,7 @@ bool Action::IsValid(const mjxproto::Action& action) {
break;
case mjxproto::ACTION_TYPE_RIICHI:
case mjxproto::ACTION_TYPE_ABORTIVE_DRAW_NINE_TERMINALS:
case mjxproto::ACTION_TYPE_NO:
case mjxproto::ACTION_TYPE_PASS:
case mjxproto::ACTION_TYPE_DUMMY:
if (action.tile() != 0) return false;
if (action.open() != 0) return false;
Expand All @@ -152,7 +143,6 @@ bool Action::IsValid(const mjxproto::Action& action) {
}

bool Action::Equal(const mjxproto::Action& lhs, const mjxproto::Action& rhs) {
if (lhs.game_id() != rhs.game_id()) return false;
if (lhs.who() != rhs.who()) return false;
if (lhs.type() != rhs.type()) return false;
if (Any(lhs.type(),
Expand Down Expand Up @@ -289,7 +279,7 @@ std::uint8_t Action::Encode(const mjxproto::Action& action) {
case mjxproto::ACTION_TYPE_ABORTIVE_DRAW_NINE_TERMINALS:
// 178: Kyuushu
return 178;
case mjxproto::ACTION_TYPE_NO:
case mjxproto::ACTION_TYPE_PASS:
// 179: No
return 179;
case mjxproto::ACTION_TYPE_DUMMY:
Expand Down
6 changes: 3 additions & 3 deletions include/mjx/internal/agent_batch_grpc_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ AgentBatchGrpcServerImpl::~AgentBatchGrpcServerImpl() {
thread_inference_.join();
}

grpc::Status AgentBatchGrpcServerImpl::TakeAction(
grpc::ServerContext *context, const mjxproto::Observation *request,
mjxproto::Action *reply) {
grpc::Status AgentBatchGrpcServerImpl::Act(grpc::ServerContext *context,
const mjxproto::Observation *request,
mjxproto::Action *reply) {
// Observationデータ追加
auto id = boost::uuids::random_generator()();
{
Expand Down
6 changes: 3 additions & 3 deletions include/mjx/internal/agent_batch_grpc_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class AgentBatchGrpcServerImpl final : public mjxproto::Agent::Service {
explicit AgentBatchGrpcServerImpl(std::unique_ptr<Strategy> strategy,
int batch_size = 8, int wait_ms = 0);
~AgentBatchGrpcServerImpl() final;
grpc::Status TakeAction(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;
grpc::Status Act(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;

private:
struct ObservationInfo {
Expand Down
2 changes: 1 addition & 1 deletion include/mjx/internal/agent_grpc_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mjxproto::Action AgentGrpcClient::TakeAction(Observation &&observation) const {
const auto request_who = request.who();
mjxproto::Action response;
grpc::ClientContext context;
grpc::Status status = stub_->TakeAction(&context, request, &response);
grpc::Status status = stub_->Act(&context, request, &response);
Assert(status.ok(), "Error code = " + std::to_string(status.error_code()) +
"\nError message = " + status.error_message() + "\n");
const auto response_who = response.who();
Expand Down
6 changes: 3 additions & 3 deletions include/mjx/internal/agent_grpc_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ namespace mjx::internal {
AgentGrpcServerImpl::AgentGrpcServerImpl(std::unique_ptr<Strategy> strategy)
: strategy_(std::move(strategy)) {}

grpc::Status AgentGrpcServerImpl::TakeAction(
grpc::ServerContext *context, const mjxproto::Observation *request,
mjxproto::Action *reply) {
grpc::Status AgentGrpcServerImpl::Act(grpc::ServerContext *context,
const mjxproto::Observation *request,
mjxproto::Action *reply) {
reply->CopyFrom(strategy_->TakeAction(Observation(*request)));
return grpc::Status::OK;
}
Expand Down
6 changes: 3 additions & 3 deletions include/mjx/internal/agent_grpc_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class AgentGrpcServerImpl final : public mjxproto::Agent::Service {
public:
explicit AgentGrpcServerImpl(std::unique_ptr<Strategy> strategy);
~AgentGrpcServerImpl() final = default;
grpc::Status TakeAction(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;
grpc::Status Act(grpc::ServerContext* context,
const mjxproto::Observation* request,
mjxproto::Action* reply) final;

private:
// Agent logic
Expand Down
Loading