From f5bedf4e34754cf38ba826f76a9fec0fc30dd202 Mon Sep 17 00:00:00 2001 From: JJJHolscher Date: Wed, 23 Aug 2023 15:08:27 +0200 Subject: [PATCH] clean up, will test this before doing the PR --- .gitmodules | 9 +++++---- Makefile | 2 +- minetester/minetest_env.py | 2 +- mods/info/mod.conf | 2 +- mods/info/settingtypes.txt | 3 --- src/client/recorder.cpp | 2 +- util/minetester/build_minetester.sh | 5 +++-- 7 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 mods/info/settingtypes.txt diff --git a/.gitmodules b/.gitmodules index 4815d559ab6a..9ad91ae9216e 100644 --- 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 index 901dd2b9f378..572249f03aed 100644 --- 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 index 00c90d771bd1..e7f24bdb656d 100644 --- 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 index 164424388ea6..85083f64d240 100644 --- a/mods/info/mod.conf +++ b/mods/info/mod.conf @@ -1 +1 @@ -name = treechop_v2 \ No newline at end of file +name = info diff --git a/mods/info/settingtypes.txt b/mods/info/settingtypes.txt deleted file mode 100644 index d2bcb74d5fc0..000000000000 --- a/mods/info/settingtypes.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Number of tree chops required for completing task -# Default is 10. At least one chop is required. -treechop_goal (Tree chop goal) int 10 1 65535 \ No newline at end of file diff --git a/src/client/recorder.cpp b/src/client/recorder.cpp index bcee03bbc84a..6e4b715d0bab 100644 --- 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 index 91d9b1e028a1..0299e8f62909 100755 --- 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 +