Merge remote-tracking branch 'upstream/main' into sximada-patch-13

environment.yml

@@ -8,7 +8,7 @@ dependencies:
     - glfw==2.5.0
     - gpy==1.10.0
     - git+https://github.com/yunshengtian/neat-python@2762ab630838520ca6c03a866e8a158f592b0370
-    - gym==0.19.0
+    - gym==0.22.0
     - h5py==3.6.0
     - imageio==2.14.1
     - matplotlib==3.5.1
@@ -20,7 +20,6 @@ dependencies:
     - pygifsicle==1.0.5
     - pyopengl==3.1.5
     - pyopengl-accelerate==3.1.5
-    - stable-baselines3==1.4.0
     - torch==1.10.2
     - ttkbootstrap==1.5.1
     - typing==3.7.4.3

evogym/simulator/CMakeLists.txt

@@ -19,6 +19,9 @@ endif()
 
 if(UNIX)
   find_package(OpenGL REQUIRED)
+  set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})  # use custom FindGLEW.cmake
+  set(GLEW_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/externals/glew/include)
+  set(GLEW_LIBRARY ${PROJECT_SOURCE_DIR}/externals/glew/lib/libGLEW.*)
   find_package(GLEW REQUIRED)
 endif()
 
@@ -46,4 +49,3 @@ add_subdirectory(SimulatorCPP/)
 
 set(CMAKE_CXX_STANDARD_LIBRARIES -ldl)
 # set(CMAKE_VERBOSE_MAKEFILE ON)
-

evogym/simulator/FindGLEW.cmake

@@ -0,0 +1,23 @@
+# FindGLEW.cmake
+# Search for GLEW library and include directories
+
+find_path(GLEW_INCLUDE_DIR GL/glew.h)
+find_library(GLEW_LIBRARY NAMES GLEW GLEW32)
+
+if (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
+    set(GLEW_FOUND TRUE)
+else()
+    set(GLEW_FOUND FALSE)
+endif()
+
+if (GLEW_FOUND)
+    if (NOT GLEW_FIND_QUIETLY)
+        message(STATUS "Found GLEW: ${GLEW_LIBRARY}")
+    endif ()
+else()
+    if (GLEW_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find GLEW")
+    endif ()
+endif()
+
+mark_as_advanced(GLEW_INCLUDE_DIR GLEW_LIBRARY)