diff --git a/README.md b/README.md index e9d81110..d82bb6f0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ - --- [![PyPI](https://img.shields.io/pypi/v/envpool)](https://pypi.org/project/envpool/) [![Downloads](https://static.pepy.tech/personalized-badge/envpool?period=total&units=international_system&left_color=grey&right_color=orange&left_text=PyPI%20Download)](https://pepy.tech/project/envpool) [![arXiv](https://img.shields.io/badge/arXiv-2206.10558-b31b1b.svg)](https://arxiv.org/abs/2206.10558) [![Read the Docs](https://img.shields.io/readthedocs/envpool)](https://envpool.readthedocs.io/) [![Unittest](https://github.com/sail-sg/envpool/workflows/Bazel%20Build%20and%20Test/badge.svg?branch=main)](https://github.com/sail-sg/envpool/actions) [![GitHub issues](https://img.shields.io/github/issues/sail-sg/envpool)](https://github.com/sail-sg/envpool/issues) [![GitHub stars](https://img.shields.io/github/stars/sail-sg/envpool)](https://github.com/sail-sg/envpool/stargazers) [![GitHub forks](https://img.shields.io/github/forks/sail-sg/envpool)](https://github.com/sail-sg/envpool/network) [![GitHub license](https://img.shields.io/github/license/sail-sg/envpool)](https://github.com/sail-sg/envpool/blob/main/LICENSE) diff --git a/envpool/__init__.py b/envpool/__init__.py index c9f8e5da..99c6596b 100644 --- a/envpool/__init__.py +++ b/envpool/__init__.py @@ -24,7 +24,7 @@ register, ) -__version__ = "0.8.2" +__version__ = "0.8.3" __all__ = [ "register", "make", diff --git a/envpool/workspace1.bzl b/envpool/workspace1.bzl index 889294a5..94100b63 100644 --- a/envpool/workspace1.bzl +++ b/envpool/workspace1.bzl @@ -14,10 +14,10 @@ """EnvPool workspace initialization, load after workspace0.""" -load("@pybind11_bazel//:python_configure.bzl", "python_configure") -load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") load("@com_github_nelhage_rules_boost//:boost/boost.bzl", "boost_deps") load("@com_justbuchanan_rules_qt//:qt_configure.bzl", "qt_configure") +load("@pybind11_bazel//:python_configure.bzl", "python_configure") +load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") def workspace(): """Configure pip requirements.""" diff --git a/examples/cleanrl_examples/ppo_atari_envpool.py b/examples/cleanrl_examples/ppo_atari_envpool.py index a049c9e6..be4813af 100644 --- a/examples/cleanrl_examples/ppo_atari_envpool.py +++ b/examples/cleanrl_examples/ppo_atari_envpool.py @@ -146,10 +146,7 @@ def parse_args(): help="the lambda for the general advantage estimation" ) parser.add_argument( - "--num-minibatches", - type=int, - default=4, - help="the number of mini-batches" + "--num-minibatches", type=int, default=4, help="the number of mini-batches" ) parser.add_argument( "--update-epochs", diff --git a/setup.cfg b/setup.cfg index 674774c4..600989fa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = envpool -version = 0.8.2 +version = 0.8.3 author = "EnvPool Contributors" author_email = "sail@sea.com" description = "C++-based high-performance parallel environment execution engine (vectorized env) for general RL environments." diff --git a/third_party/pip_requirements/requirements-dev.txt b/third_party/pip_requirements/requirements-dev.txt index 4786f03c..8e293c0e 100644 --- a/third_party/pip_requirements/requirements-dev.txt +++ b/third_party/pip_requirements/requirements-dev.txt @@ -10,7 +10,7 @@ absl-py packaging tqdm protobuf<=4.20.0 -torch!=2.0.0 +torch!=2.0.0,!=2.0.1 tianshou>=0.4.10 opencv-python-headless box2d-py diff --git a/third_party/vizdoom/vizdoom.BUILD b/third_party/vizdoom/vizdoom.BUILD index f197e4f7..2bbfef52 100644 --- a/third_party/vizdoom/vizdoom.BUILD +++ b/third_party/vizdoom/vizdoom.BUILD @@ -383,13 +383,12 @@ cc_binary( "src/*.h", "src/**/*.h", ]) + [ - ":viz_version", - ":sc_man_scanner", - "src/asm_x86_64/tmap3.s", + "src/GuillotineBinPack.cpp", + "src/SkylineBinPack.cpp", "src/__autostart.cpp", - "src/x86.cpp", "src/actorptrselect.cpp", "src/am_map.cpp", + "src/asm_x86_64/tmap3.s", "src/b_bot.cpp", "src/b_func.cpp", "src/b_game.cpp", @@ -425,18 +424,73 @@ cc_binary( "src/f_wipe.cpp", "src/farchive.cpp", "src/files.cpp", + "src/fragglescript/t_cmd.cpp", + "src/fragglescript/t_fspic.cpp", + "src/fragglescript/t_func.cpp", + "src/fragglescript/t_load.cpp", + "src/fragglescript/t_oper.cpp", + "src/fragglescript/t_parse.cpp", + "src/fragglescript/t_prepro.cpp", + "src/fragglescript/t_script.cpp", + "src/fragglescript/t_spec.cpp", + "src/fragglescript/t_variable.cpp", + "src/g_doom/a_doommisc.cpp", "src/g_doomedmap.cpp", "src/g_game.cpp", + "src/g_heretic/a_hereticmisc.cpp", + "src/g_hexen/a_hexenmisc.cpp", "src/g_hub.cpp", "src/g_level.cpp", "src/g_mapinfo.cpp", + "src/g_raven/a_artitele.cpp", + "src/g_raven/a_minotaur.cpp", + "src/g_shared/a_action.cpp", + "src/g_shared/a_armor.cpp", + "src/g_shared/a_artifacts.cpp", + "src/g_shared/a_bridge.cpp", + "src/g_shared/a_camera.cpp", + "src/g_shared/a_debris.cpp", + "src/g_shared/a_decals.cpp", + "src/g_shared/a_fastprojectile.cpp", + "src/g_shared/a_flashfader.cpp", + "src/g_shared/a_fountain.cpp", + "src/g_shared/a_hatetarget.cpp", + "src/g_shared/a_keys.cpp", + "src/g_shared/a_lightning.cpp", + "src/g_shared/a_mapmarker.cpp", + "src/g_shared/a_morph.cpp", + "src/g_shared/a_movingcamera.cpp", + "src/g_shared/a_pickups.cpp", + "src/g_shared/a_puzzleitems.cpp", + "src/g_shared/a_quake.cpp", + "src/g_shared/a_randomspawner.cpp", + "src/g_shared/a_secrettrigger.cpp", + "src/g_shared/a_sectoraction.cpp", + "src/g_shared/a_setcolor.cpp", + "src/g_shared/a_skies.cpp", + "src/g_shared/a_soundenvironment.cpp", + "src/g_shared/a_soundsequence.cpp", + "src/g_shared/a_spark.cpp", + "src/g_shared/a_specialspot.cpp", + "src/g_shared/a_waterzone.cpp", + "src/g_shared/a_weaponpiece.cpp", + "src/g_shared/a_weapons.cpp", + "src/g_shared/hudmessages.cpp", + "src/g_shared/sbar_mugshot.cpp", + "src/g_shared/sbarinfo.cpp", + "src/g_shared/shared_hud.cpp", + "src/g_shared/shared_sbar.cpp", "src/g_skill.cpp", + "src/g_strife/a_strifestuff.cpp", + "src/g_strife/strife_sbar.cpp", "src/gameconfigfile.cpp", "src/gi.cpp", "src/gitinfo.cpp", "src/hu_scores.cpp", "src/i_net.cpp", "src/info.cpp", + "src/intermission/intermission.cpp", + "src/intermission/intermission_parse.cpp", "src/keysections.cpp", "src/lumpconfigfile.cpp", "src/m_alloc.cpp", @@ -448,30 +502,37 @@ cc_binary( "src/m_png.cpp", "src/m_random.cpp", "src/m_specialpaths.cpp", - "src/memarena.cpp", "src/md5.cpp", + "src/memarena.cpp", + "src/menu/colorpickermenu.cpp", + "src/menu/joystickmenu.cpp", + "src/menu/listmenu.cpp", + "src/menu/loadsavemenu.cpp", + "src/menu/menu.cpp", + "src/menu/menudef.cpp", + "src/menu/menuinput.cpp", + "src/menu/messagebox.cpp", + "src/menu/optionmenu.cpp", + "src/menu/playerdisplay.cpp", + "src/menu/playermenu.cpp", + "src/menu/readthis.cpp", + "src/menu/videomenu.cpp", "src/name.cpp", - "src/posix/i_cd.cpp", - "src/posix/i_movie.cpp", - "src/posix/i_steam.cpp", - "src/posix/sdl/crashcatcher.c", - "src/posix/sdl/hardware.cpp", - "src/posix/sdl/i_gui.cpp", - "src/posix/sdl/i_input.cpp", - "src/posix/sdl/i_joystick.cpp", - "src/posix/sdl/i_main.cpp", - "src/posix/sdl/i_system.cpp", - "src/posix/sdl/i_timer.cpp", - "src/posix/sdl/sdlvideo.cpp", - "src/posix/sdl/st_start.cpp", "src/nodebuild.cpp", - "src/nodebuild_classify_sse2.cpp", "src/nodebuild_classify_nosse2.cpp", + "src/nodebuild_classify_sse2.cpp", "src/nodebuild_events.cpp", "src/nodebuild_extract.cpp", "src/nodebuild_gl.cpp", "src/nodebuild_utility.cpp", - "src/pathexpander.cpp", + "src/oplsynth/OPL3.cpp", + "src/oplsynth/dosbox/opl.cpp", + "src/oplsynth/mlopl.cpp", + "src/oplsynth/mlopl_io.cpp", + "src/oplsynth/music_opl_mididevice.cpp", + "src/oplsynth/music_opldumper_mididevice.cpp", + "src/oplsynth/nukedopl3.cpp", + "src/oplsynth/opl_mus_player.cpp", "src/p_3dfloors.cpp", "src/p_3dmidtex.cpp", "src/p_acs.cpp", @@ -513,122 +574,54 @@ cc_binary( "src/p_writemap.cpp", "src/p_xlat.cpp", "src/parsecontext.cpp", + "src/pathexpander.cpp", "src/po_man.cpp", - "src/r_swrenderer.cpp", - "src/r_utility.cpp", + "src/posix/i_cd.cpp", + "src/posix/i_movie.cpp", + "src/posix/i_steam.cpp", + "src/posix/sdl/crashcatcher.c", + "src/posix/sdl/hardware.cpp", + "src/posix/sdl/i_gui.cpp", + "src/posix/sdl/i_input.cpp", + "src/posix/sdl/i_joystick.cpp", + "src/posix/sdl/i_main.cpp", + "src/posix/sdl/i_system.cpp", + "src/posix/sdl/i_timer.cpp", + "src/posix/sdl/sdlvideo.cpp", + "src/posix/sdl/st_start.cpp", "src/r_3dfloors.cpp", "src/r_bsp.cpp", + "src/r_data/colormaps.cpp", + "src/r_data/r_interpolate.cpp", + "src/r_data/r_translate.cpp", + "src/r_data/renderstyle.cpp", + "src/r_data/sprites.cpp", + "src/r_data/voxels.cpp", "src/r_draw.cpp", "src/r_drawt.cpp", "src/r_main.cpp", "src/r_plane.cpp", "src/r_segs.cpp", "src/r_sky.cpp", + "src/r_swrenderer.cpp", "src/r_things.cpp", - "src/s_advsound.cpp", - "src/s_environment.cpp", - "src/s_playlist.cpp", - "src/s_sndseq.cpp", - "src/s_sound.cpp", - "src/sc_man.cpp", - "src/st_stuff.cpp", - "src/statistics.cpp", - "src/stats.cpp", - "src/stringtable.cpp", - "src/strnatcmp.c", - "src/tables.cpp", - "src/teaminfo.cpp", - "src/tempfiles.cpp", - "src/v_blend.cpp", - "src/v_collection.cpp", - "src/v_draw.cpp", - "src/v_font.cpp", - "src/v_palette.cpp", - "src/v_pfx.cpp", - "src/v_text.cpp", - "src/v_video.cpp", - "src/w_wad.cpp", - "src/wi_stuff.cpp", - "src/zstrformat.cpp", - "src/zstring.cpp", - "src/GuillotineBinPack.cpp", - "src/SkylineBinPack.cpp", - "src/g_doom/a_doommisc.cpp", - "src/g_heretic/a_hereticmisc.cpp", - "src/g_hexen/a_hexenmisc.cpp", - "src/g_raven/a_artitele.cpp", - "src/g_raven/a_minotaur.cpp", - "src/g_strife/a_strifestuff.cpp", - "src/g_strife/strife_sbar.cpp", - "src/g_shared/a_action.cpp", - "src/g_shared/a_armor.cpp", - "src/g_shared/a_artifacts.cpp", - "src/g_shared/a_bridge.cpp", - "src/g_shared/a_camera.cpp", - "src/g_shared/a_debris.cpp", - "src/g_shared/a_decals.cpp", - "src/g_shared/a_fastprojectile.cpp", - "src/g_shared/a_flashfader.cpp", - "src/g_shared/a_fountain.cpp", - "src/g_shared/a_hatetarget.cpp", - "src/g_shared/a_keys.cpp", - "src/g_shared/a_lightning.cpp", - "src/g_shared/a_mapmarker.cpp", - "src/g_shared/a_morph.cpp", - "src/g_shared/a_movingcamera.cpp", - "src/g_shared/a_pickups.cpp", - "src/g_shared/a_puzzleitems.cpp", - "src/g_shared/a_quake.cpp", - "src/g_shared/a_randomspawner.cpp", - "src/g_shared/a_secrettrigger.cpp", - "src/g_shared/a_sectoraction.cpp", - "src/g_shared/a_setcolor.cpp", - "src/g_shared/a_skies.cpp", - "src/g_shared/a_soundenvironment.cpp", - "src/g_shared/a_soundsequence.cpp", - "src/g_shared/a_spark.cpp", - "src/g_shared/a_specialspot.cpp", - "src/g_shared/a_waterzone.cpp", - "src/g_shared/a_weaponpiece.cpp", - "src/g_shared/a_weapons.cpp", - "src/g_shared/hudmessages.cpp", - "src/g_shared/sbarinfo.cpp", - "src/g_shared/sbar_mugshot.cpp", - "src/g_shared/shared_hud.cpp", - "src/g_shared/shared_sbar.cpp", - "src/intermission/intermission.cpp", - "src/intermission/intermission_parse.cpp", - "src/menu/colorpickermenu.cpp", - "src/menu/joystickmenu.cpp", - "src/menu/listmenu.cpp", - "src/menu/loadsavemenu.cpp", - "src/menu/menu.cpp", - "src/menu/menudef.cpp", - "src/menu/menuinput.cpp", - "src/menu/messagebox.cpp", - "src/menu/optionmenu.cpp", - "src/menu/playerdisplay.cpp", - "src/menu/playermenu.cpp", - "src/menu/readthis.cpp", - "src/menu/videomenu.cpp", - "src/oplsynth/mlopl.cpp", - "src/oplsynth/mlopl_io.cpp", - "src/oplsynth/music_opldumper_mididevice.cpp", - "src/oplsynth/music_opl_mididevice.cpp", - "src/oplsynth/opl_mus_player.cpp", - "src/oplsynth/dosbox/opl.cpp", - "src/oplsynth/OPL3.cpp", - "src/oplsynth/nukedopl3.cpp", + "src/r_utility.cpp", "src/resourcefiles/ancientzip.cpp", "src/resourcefiles/file_7z.cpp", + "src/resourcefiles/file_directory.cpp", "src/resourcefiles/file_grp.cpp", "src/resourcefiles/file_lump.cpp", + "src/resourcefiles/file_pak.cpp", "src/resourcefiles/file_rff.cpp", "src/resourcefiles/file_wad.cpp", "src/resourcefiles/file_zip.cpp", - "src/resourcefiles/file_pak.cpp", - "src/resourcefiles/file_directory.cpp", "src/resourcefiles/resourcefile.cpp", + "src/s_advsound.cpp", + "src/s_environment.cpp", + "src/s_playlist.cpp", + "src/s_sndseq.cpp", + "src/s_sound.cpp", + "src/sc_man.cpp", "src/sfmt/SFMT.cpp", "src/sound/fmodsound.cpp", "src/sound/i_music.cpp", @@ -636,31 +629,40 @@ cc_binary( "src/sound/mpg123_decoder.cpp", "src/sound/music_cd.cpp", "src/sound/music_dumb.cpp", + "src/sound/music_fluidsynth_mididevice.cpp", "src/sound/music_gme.cpp", - "src/sound/music_mus_midiout.cpp", - "src/sound/music_smf_midiout.cpp", "src/sound/music_hmi_midiout.cpp", - "src/sound/music_xmi_midiout.cpp", - "src/sound/music_midistream.cpp", "src/sound/music_midi_base.cpp", "src/sound/music_midi_timidity.cpp", + "src/sound/music_midistream.cpp", + "src/sound/music_mus_midiout.cpp", "src/sound/music_mus_opl.cpp", - "src/sound/music_stream.cpp", - "src/sound/music_fluidsynth_mididevice.cpp", + "src/sound/music_pseudo_mididevice.cpp", + "src/sound/music_smf_midiout.cpp", "src/sound/music_softsynth_mididevice.cpp", + "src/sound/music_stream.cpp", "src/sound/music_timidity_mididevice.cpp", "src/sound/music_wildmidi_mididevice.cpp", "src/sound/music_win_mididevice.cpp", + "src/sound/music_xmi_midiout.cpp", "src/sound/oalsound.cpp", "src/sound/sndfile_decoder.cpp", - "src/sound/music_pseudo_mididevice.cpp", - "src/textures/animations.cpp", + "src/st_stuff.cpp", + "src/statistics.cpp", + "src/stats.cpp", + "src/stringtable.cpp", + "src/strnatcmp.c", + "src/tables.cpp", + "src/teaminfo.cpp", + "src/tempfiles.cpp", "src/textures/anim_switches.cpp", + "src/textures/animations.cpp", "src/textures/automaptexture.cpp", "src/textures/bitmap.cpp", "src/textures/buildtexture.cpp", "src/textures/canvastexture.cpp", "src/textures/ddstexture.cpp", + "src/textures/emptytexture.cpp", "src/textures/flattexture.cpp", "src/textures/imgztexture.cpp", "src/textures/jpegtexture.cpp", @@ -669,7 +671,6 @@ cc_binary( "src/textures/pcxtexture.cpp", "src/textures/pngtexture.cpp", "src/textures/rawpagetexture.cpp", - "src/textures/emptytexture.cpp", "src/textures/texture.cpp", "src/textures/texturemanager.cpp", "src/textures/tgatexture.cpp", @@ -693,29 +694,14 @@ cc_binary( "src/timidity/playmidi.cpp", "src/timidity/resample.cpp", "src/timidity/timidity.cpp", - "src/wildmidi/file_io.cpp", - "src/wildmidi/gus_pat.cpp", - "src/wildmidi/reverb.cpp", - "src/wildmidi/wildmidi_lib.cpp", - "src/wildmidi/wm_error.cpp", - "src/xlat/parse_xlat.cpp", - "src/fragglescript/t_fspic.cpp", - "src/fragglescript/t_func.cpp", - "src/fragglescript/t_load.cpp", - "src/fragglescript/t_oper.cpp", - "src/fragglescript/t_parse.cpp", - "src/fragglescript/t_prepro.cpp", - "src/fragglescript/t_script.cpp", - "src/fragglescript/t_spec.cpp", - "src/fragglescript/t_variable.cpp", - "src/fragglescript/t_cmd.cpp", - "src/r_data/colormaps.cpp", - "src/r_data/sprites.cpp", - "src/r_data/voxels.cpp", - "src/r_data/renderstyle.cpp", - "src/r_data/r_interpolate.cpp", - "src/r_data/r_translate.cpp", - "src/zzautozend.cpp", + "src/v_blend.cpp", + "src/v_collection.cpp", + "src/v_draw.cpp", + "src/v_font.cpp", + "src/v_palette.cpp", + "src/v_pfx.cpp", + "src/v_text.cpp", + "src/v_video.cpp", "src/viz_buffers.cpp", "src/viz_depth.cpp", "src/viz_game.cpp", @@ -725,6 +711,20 @@ cc_binary( "src/viz_message_queue.cpp", "src/viz_shared_memory.cpp", "src/viz_system.cpp", + "src/w_wad.cpp", + "src/wi_stuff.cpp", + "src/wildmidi/file_io.cpp", + "src/wildmidi/gus_pat.cpp", + "src/wildmidi/reverb.cpp", + "src/wildmidi/wildmidi_lib.cpp", + "src/wildmidi/wm_error.cpp", + "src/x86.cpp", + "src/xlat/parse_xlat.cpp", + "src/zstrformat.cpp", + "src/zstring.cpp", + "src/zzautozend.cpp", + ":sc_man_scanner", + ":viz_version", "@glibc_version_header//:glibc_2_17", ], copts = [