clean up, will test this before doing the PR

EleutherAI · Aug 23, 2023 · f5bedf4 · f5bedf4
1 parent cd17158
commit f5bedf4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,13 +1,14 @@
 [submodule "lib/irrlichtmt"]
  path = lib/irrlichtmt
- url = https://github.com/EleutherAI/irrlicht 
+ url = git@github.com:EleutherAI/irrlicht.git 
  branch = headless-rendering
+
 [submodule "lib/zmqpp"]
  path = lib/zmqpp
- url = https://github.com/zeromq/zmqpp
+ url = git@github.com:zeromq/zmqpp.git
 [submodule "games/minetest_game"]
  path = games/minetest_game
- url = https://github.com/minetest/minetest_game
+ url = git@github.com:minetest/minetest_game.git
 [submodule "lib/SDL"]
  path = lib/SDL
- url = https://github.com/libsdl-org/SDL
+ url = git@github.com:libsdl-org/SDL.git
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ SDL2_CMAKE_FILE := lib/SDL/build/lib/cmake/SDL2/sdl2-config.cmake
 ZMQPP_LIB_FILE := lib/zmqpp/build/max-g++/libzmqpp.a
 MINETEST_BINARY := bin/minetest
 DEBUG_BINARY := bin/minetest_debug
-MINETESTER_WHEEL := build/package/wheel/minetester-$(MINETESTER_VERSION)-py3-none-any.whl
+MINETESTER_WHEEL := build/package/wheel/minetester-$(MINETESTER_VERSION)-py3-none-manylinux_2_35_x86_64.whl
 
 default: minetest 
 

diff --git a/minetester/minetest_env.py b/minetester/minetest_env.py
@@ -381,7 +381,7 @@ def reset(self):
  byte_obs = self.socket.recv()
  obs, _, _, _, _ = unpack_pb_obs(byte_obs)
  self.last_obs = obs
- logging.debug("Received first obs, obs: {}".format(obs))
+ logging.debug("Received first obs: {}".format(obs.shape))
  return obs
 
  def step(self, action: Dict[str, Any]):

diff --git a/mods/info/mod.conf b/mods/info/mod.conf
@@ -1 +1 @@
-name = treechop_v2
+name = info
diff --git a/mods/info/settingtypes.txt b/mods/info/settingtypes.txt
diff --git a/src/client/recorder.cpp b/src/client/recorder.cpp
@@ -44,7 +44,7 @@ void Recorder::setTerminal(bool & terminal) {
 void Recorder::sendObservation() {
  pb_objects::Observation obsToSend;
  obsToSend.set_reward(rewardToSend);
- obsToSend.set_info(infoToSend);
+ obsToSend.set_info(infoToSend);
  obsToSend.set_terminal(terminalToSend);
  obsToSend.set_allocated_image(&imgToSend);
  obsToSend.set_allocated_action(&actionToSend);

diff --git a/util/minetester/build_minetester.sh b/util/minetester/build_minetester.sh
@@ -22,10 +22,11 @@ python -m build
 
 #Update RPATHS and add relevant libraries to wheel
 cd dist
-# auditwheel repair minetester-*.*.*-py3-none-any.whl --plat manylinux_2_35_x86_64
+auditwheel repair minetester-*.*.*-py3-none-any.whl --plat manylinux_2_35_x86_64
 
 cd ../../..
 
 mkdir build/package/wheel
 
-cp build/package/dist/minetester-*.*.*-py3-none-manylinux_2_35_x86_64.whl build/package/wheel
+cp build/package/dist/wheelhouse/minetester-*.*.*-py3-none-manylinux_2_35_x86_64.whl build/package/wheel
+