Disable SW rendering while OSMesa support is not working

google-deepmind · Oct 29, 2019 · 0fae20c · 0fae20c
1 parent a2087d7
commit 0fae20c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/BUILD b/BUILD
@@ -927,7 +927,7 @@ cc_library(
     hdrs = ["public/dmlab.h"],
     data = [
         ":libdmlab_headless_hw.so",
-        ":libdmlab_headless_sw.so",
+        #":libdmlab_headless_sw.so",
     ],
     linkopts = ["-ldl"],
     visibility = ["//testing:__subpackages__"],

diff --git a/python/dmlab_module.c b/python/dmlab_module.c
@@ -185,7 +185,7 @@ static int Lab_init(PyObject* pself, PyObject* args, PyObject* kwds) {
 
     DeepMindLabLaunchParams params = {};
     params.runfiles_path = get_module_state(module)->runfiles_path;
-    params.renderer = DeepMindLabRenderer_Software;
+    params.renderer = DeepMindLabRenderer_Hardware;
     if (renderer != NULL && renderer[0] != '\0') {
       if (strcmp(renderer, "hardware") == 0) {
         params.renderer = DeepMindLabRenderer_Hardware;

diff --git a/testing/load_level_test.cc b/testing/load_level_test.cc
@@ -26,7 +26,7 @@ TEST(LoadLevelTest, LoadLevelAndWait) {
 
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;

diff --git a/testing/lua_unit_test.cc b/testing/lua_unit_test.cc
@@ -32,7 +32,7 @@ TEST(LuaUnitTest, RunsTest) {
 
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;

diff --git a/testing/recording_test.cc b/testing/recording_test.cc
@@ -115,7 +115,7 @@ class RecordingTest : public ::testing::Test {
 TEST_F(RecordingTest, SavesRecordingToDemoDirectory) {
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;
@@ -152,7 +152,7 @@ TEST_F(RecordingTest, SavesRecordingToDemoDirectory) {
 TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) {
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;
@@ -216,7 +216,7 @@ TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) {
 TEST_F(RecordingTest, RecordsMultipleVideos) {
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;
@@ -270,7 +270,7 @@ TEST_F(RecordingTest, RecordsMultipleVideos) {
 TEST_F(RecordingTest, TotalScorePreserved) {
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;
@@ -325,7 +325,7 @@ TEST_F(RecordingTest, TotalScorePreserved) {
 TEST_F(RecordingTest, MissingDemoFilesSetsError) {
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;

diff --git a/testing/seed_level_test.cc b/testing/seed_level_test.cc
@@ -23,7 +23,7 @@ TEST(SeedLevelTest, RandomSeedTest) {
 
   DeepMindLabLaunchParams params = {};
   params.runfiles_path = runfiles_path.c_str();
-  params.renderer = DeepMindLabRenderer_Software;
+  params.renderer = DeepMindLabRenderer_Hardware;
 
   EnvCApi env_c_api;
   void* context;