flopyarcade 0.6.2__tar.gz → 0.6.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {flopyarcade-0.6.2/flopyarcade.egg-info → flopyarcade-0.6.4}/PKG-INFO +19 -20
- flopyarcade-0.6.4/flopyarcade/examples/policymodels/2s-d/2s-d +0 -0
- flopyarcade-0.6.4/flopyarcade/examples/policymodels/2s-d/2s-d.tune_metadata +0 -0
- flopyarcade-0.6.4/flopyarcade/examples/policymodels/3s-d/3s-d +0 -0
- flopyarcade-0.6.4/flopyarcade/examples/policymodels/3s-d/3s-d.tune_metadata +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/flopyarcade.py +12 -5
- flopyarcade-0.6.4/flopyarcade/simulators/simulators_linux.zip +0 -0
- flopyarcade-0.6.4/flopyarcade/simulators/simulators_mac.zip +0 -0
- flopyarcade-0.6.4/flopyarcade/simulators/simulators_win32.zip +0 -0
- flopyarcade-0.6.4/flopyarcade/simulators/simulators_win64.zip +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_rllib_apexdqn.py +97 -8
- {flopyarcade-0.6.2 → flopyarcade-0.6.4/flopyarcade.egg-info}/PKG-INFO +19 -20
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade.egg-info/SOURCES.txt +4 -0
- flopyarcade-0.6.4/flopyarcade.egg-info/requires.txt +20 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/setup.py +21 -21
- flopyarcade-0.6.2/flopyarcade/examples/policymodels/2s-d/2s-d +0 -0
- flopyarcade-0.6.2/flopyarcade/examples/policymodels/2s-d/2s-d.tune_metadata +0 -0
- flopyarcade-0.6.2/flopyarcade/examples/policymodels/3s-d/3s-d +0 -0
- flopyarcade-0.6.2/flopyarcade/examples/policymodels/3s-d/3s-d.tune_metadata +0 -0
- flopyarcade-0.6.2/flopyarcade.egg-info/requires.txt +0 -21
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/LICENSE +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/MANIFEST.in +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/README.md +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/__init__.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/1s-d/.is_checkpoint +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/1s-d/1s-d +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/1s-d/1s-d.tune_metadata +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/2s-d/.is_checkpoint +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/3s-d/.is_checkpoint +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/play.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/play_againstai.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/tests/__init__.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/tests/test_agent_dqn.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/tests/test_agent_neuroevolution.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/tests/test_play.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_dqn.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_neuroevolution.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_rllib2_apexdqn.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_rllib_appo.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_rllib_impala.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/train_rllib_ppo.py +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade.egg-info/dependency_links.txt +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade.egg-info/top_level.txt +0 -0
- {flopyarcade-0.6.2 → flopyarcade-0.6.4}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: flopyarcade
|
|
3
|
-
Version: 0.6.
|
|
3
|
+
Version: 0.6.4
|
|
4
4
|
Summary: Simulated groundwater flow environments for reinforcement learning.
|
|
5
5
|
Home-page: https://github.com/philipphoehn/flopyarcade
|
|
6
6
|
Author: Philipp Hoehn
|
|
@@ -22,23 +22,22 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
|
|
|
22
22
|
Classifier: Topic :: Education
|
|
23
23
|
License-File: LICENSE
|
|
24
24
|
Requires-Dist: flopy==3.3.5
|
|
25
|
-
Requires-Dist:
|
|
26
|
-
Requires-Dist:
|
|
27
|
-
Requires-Dist:
|
|
28
|
-
Requires-Dist:
|
|
29
|
-
Requires-Dist:
|
|
30
|
-
Requires-Dist:
|
|
31
|
-
Requires-Dist: matplotlib==3.5.3
|
|
25
|
+
Requires-Dist: gymnasium
|
|
26
|
+
Requires-Dist: imageio
|
|
27
|
+
Requires-Dist: ipython
|
|
28
|
+
Requires-Dist: joblib
|
|
29
|
+
Requires-Dist: lz4
|
|
30
|
+
Requires-Dist: matplotlib
|
|
32
31
|
Requires-Dist: importlib-metadata==4.13.0
|
|
33
|
-
Requires-Dist: numpy
|
|
34
|
-
Requires-Dist: pandas
|
|
35
|
-
Requires-Dist: pathos
|
|
36
|
-
Requires-Dist: pillow
|
|
37
|
-
Requires-Dist: pygame
|
|
38
|
-
Requires-Dist: ray
|
|
39
|
-
Requires-Dist: ray[tune]
|
|
40
|
-
Requires-Dist: ray[rllib]
|
|
41
|
-
Requires-Dist: scikit-image
|
|
42
|
-
Requires-Dist: tensorflow
|
|
43
|
-
Requires-Dist: tqdm
|
|
44
|
-
Requires-Dist: xmipy
|
|
32
|
+
Requires-Dist: numpy
|
|
33
|
+
Requires-Dist: pandas
|
|
34
|
+
Requires-Dist: pathos
|
|
35
|
+
Requires-Dist: pillow
|
|
36
|
+
Requires-Dist: pygame
|
|
37
|
+
Requires-Dist: ray
|
|
38
|
+
Requires-Dist: ray[tune]
|
|
39
|
+
Requires-Dist: ray[rllib]
|
|
40
|
+
Requires-Dist: scikit-image
|
|
41
|
+
Requires-Dist: tensorflow
|
|
42
|
+
Requires-Dist: tqdm
|
|
43
|
+
Requires-Dist: xmipy
|
|
Binary file
|
|
Binary file
|
|
@@ -193,6 +193,7 @@ class FloPyEnv(gym.Env):
|
|
|
193
193
|
env_config (dict, optional): Additional environment configuration overrides.
|
|
194
194
|
|
|
195
195
|
"""
|
|
196
|
+
|
|
196
197
|
self._init_env_config(locals(), env_config)
|
|
197
198
|
self._setup_workspace()
|
|
198
199
|
self._init_env_vars(_seed)
|
|
@@ -377,9 +378,12 @@ class FloPyEnv(gym.Env):
|
|
|
377
378
|
self (object): The instance of the class.
|
|
378
379
|
|
|
379
380
|
"""
|
|
381
|
+
import gymnasium
|
|
382
|
+
|
|
380
383
|
obs_array = np.array(self.observations)
|
|
381
384
|
|
|
382
|
-
self.observation_space =
|
|
385
|
+
self.observation_space = gymnasium.spaces.Box(
|
|
386
|
+
# self.observation_space = gym.spaces.Box(
|
|
383
387
|
low=-25.0,
|
|
384
388
|
high=25.0,
|
|
385
389
|
shape=obs_array.shape,
|
|
@@ -387,20 +391,22 @@ class FloPyEnv(gym.Env):
|
|
|
387
391
|
)
|
|
388
392
|
|
|
389
393
|
if self.actionType == 'discrete':
|
|
390
|
-
self.action_space =
|
|
394
|
+
self.action_space = gymnasium.spaces.Discrete(len(self.actionSpace))
|
|
395
|
+
# self.action_space = gym.spaces.Discrete(len(self.actionSpace))
|
|
391
396
|
elif self.actionType == 'continuous':
|
|
392
397
|
if self.ENVTYPE == '3s-c':
|
|
393
398
|
self.actionSpaceSize = 4
|
|
394
399
|
self.distanceMax = 98.0
|
|
395
400
|
self.rewardMax = 1000.0
|
|
396
|
-
self.action_space =
|
|
401
|
+
self.action_space = gymnasium.spaces.Box(
|
|
402
|
+
# self.action_space = gym.spaces.Box(
|
|
397
403
|
low=0.0,
|
|
398
404
|
high=1.0,
|
|
399
405
|
shape=(self.actionSpaceSize,),
|
|
400
406
|
dtype=np.float32
|
|
401
407
|
)
|
|
402
408
|
|
|
403
|
-
print('self.observation_space, self.action_space', self.observation_space, self.action_space)
|
|
409
|
+
print('DEBUG self.observation_space, self.action_space', self.observation_space, self.action_space)
|
|
404
410
|
|
|
405
411
|
def seed(self, seed=None):
|
|
406
412
|
"""Set the random seed for reproducibility.
|
|
@@ -8408,7 +8414,8 @@ class FloPyAgent():
|
|
|
8408
8414
|
predict_on_batch robust in parallel operation?
|
|
8409
8415
|
"""
|
|
8410
8416
|
|
|
8411
|
-
state = array(state).reshape(-1,
|
|
8417
|
+
state = array(state).reshape(-1, *shape(state))
|
|
8418
|
+
# state = array(state).reshape(-1, (*shape(state)))
|
|
8412
8419
|
prediction = agentModel.predict_on_batch(state)[0]
|
|
8413
8420
|
return prediction
|
|
8414
8421
|
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -88,7 +88,7 @@ config = {
|
|
|
88
88
|
'' # "num_workers": args.cpus-2 if args.cpus >= 3 else args.cpus, # weird, but 16 workers on 16 cores failed to work
|
|
89
89
|
"num_gpus": args.gpus,
|
|
90
90
|
"framework": "tf",
|
|
91
|
-
"env": "
|
|
91
|
+
"env": "registered_env",
|
|
92
92
|
"optimizer": {
|
|
93
93
|
"max_weight_sync_delay": 40000,
|
|
94
94
|
"num_replay_buffer_shards": 1,
|
|
@@ -112,6 +112,10 @@ config = {
|
|
|
112
112
|
"log_level": "ERROR"
|
|
113
113
|
}
|
|
114
114
|
|
|
115
|
+
config = {
|
|
116
|
+
"env": "my_custom_env",
|
|
117
|
+
}
|
|
118
|
+
|
|
115
119
|
config_stopCriteria = {
|
|
116
120
|
"training_iteration": 1000000000000,
|
|
117
121
|
"timesteps_total": 1000000000000,
|
|
@@ -125,7 +129,11 @@ def env_creator(env_config):
|
|
|
125
129
|
|
|
126
130
|
env_config = {}
|
|
127
131
|
env_config['ENVTYPE'] = ENVTYPE
|
|
128
|
-
env = FloPyEnv(env_config=env_config)
|
|
132
|
+
env = FloPyEnv(env_config=env_config, initWithSolution=True)
|
|
133
|
+
|
|
134
|
+
from gymnasium.wrappers import EnvCompatibility
|
|
135
|
+
env = EnvCompatibility(env).env
|
|
136
|
+
print(dir(env))
|
|
129
137
|
|
|
130
138
|
return env
|
|
131
139
|
|
|
@@ -159,22 +167,41 @@ if __name__ == "__main__":
|
|
|
159
167
|
elif args.playbenchmark:
|
|
160
168
|
# suppressing Ray messages and warnings here for comfort
|
|
161
169
|
rayInit(log_to_driver=False, logging_level=FATAL)
|
|
162
|
-
register_env('
|
|
170
|
+
register_env('registered_env', env_creator)
|
|
171
|
+
|
|
172
|
+
# from gym.spaces import Box, Discrete
|
|
173
|
+
from gymnasium.spaces import Box, Discrete
|
|
174
|
+
import numpy as np
|
|
175
|
+
env = env_creator(env_config={'ENVTYPE': ENVTYPE})
|
|
176
|
+
# obs_space = env.observation_space
|
|
177
|
+
obs_space = Box(
|
|
178
|
+
low=-25.0,
|
|
179
|
+
high=25.0,
|
|
180
|
+
shape=np.array(env.observations).shape,
|
|
181
|
+
dtype=np.float32
|
|
182
|
+
)
|
|
183
|
+
# act_space = env.action_space # else currently buggy because of version issues
|
|
184
|
+
act_space = Discrete(env.actionSpaceSize)
|
|
185
|
+
# obs_space = Box(-25.0, 25.0, (1165,), np.float32)
|
|
186
|
+
# act_space = Discrete(3)
|
|
187
|
+
print(obs_space)
|
|
188
|
+
print(act_space)
|
|
163
189
|
|
|
164
190
|
if not exists(join(wrkspc, 'temp')):
|
|
165
191
|
makedirs(join(wrkspc, 'temp'))
|
|
166
192
|
if not exists(join(wrkspc, 'temp', 'ray_results')):
|
|
167
193
|
makedirs(join(wrkspc, 'temp', 'ray_results'))
|
|
168
194
|
|
|
195
|
+
print('args.playbenchmark', args.playbenchmark, 'args.external', args.external)
|
|
196
|
+
|
|
169
197
|
if not args.playbenchmark:
|
|
170
198
|
|
|
171
199
|
print(config)
|
|
172
|
-
# restore_path = join(wrkspc, 'temp', 'ray_results', '
|
|
200
|
+
# restore_path = join(wrkspc, 'temp', 'ray_results', 'APEX_registered_env_2bce0_00000_0_2022-01-05_23-38-15', 'checkpoint_000540', 'checkpoint-540')
|
|
173
201
|
results = tune.run(
|
|
174
202
|
"APEX",
|
|
175
203
|
name=ENVTYPE + args.suffix,
|
|
176
204
|
config=config,
|
|
177
|
-
# config=config,
|
|
178
205
|
stop=config_stopCriteria,
|
|
179
206
|
verbose=3,
|
|
180
207
|
checkpoint_freq=1,
|
|
@@ -195,7 +222,7 @@ if __name__ == "__main__":
|
|
|
195
222
|
"num_workers": 1,
|
|
196
223
|
"num_gpus": 0,
|
|
197
224
|
"framework": "tf",
|
|
198
|
-
"env": "
|
|
225
|
+
"env": "registered_env",
|
|
199
226
|
"optimizer": {
|
|
200
227
|
"max_weight_sync_delay": 400,
|
|
201
228
|
"num_replay_buffer_shards": 1,
|
|
@@ -213,13 +240,26 @@ if __name__ == "__main__":
|
|
|
213
240
|
"min_iter_time_s": 30,
|
|
214
241
|
"training_intensity": None,
|
|
215
242
|
"lr": 0.00005,
|
|
243
|
+
|
|
244
|
+
"multiagent": {
|
|
245
|
+
"policies": {
|
|
246
|
+
"default_policy": (None, obs_space, act_space, {}),
|
|
247
|
+
},
|
|
248
|
+
"policy_mapping_fn": lambda agent_id: "default_policy",
|
|
249
|
+
}
|
|
250
|
+
|
|
216
251
|
}
|
|
217
252
|
|
|
218
253
|
__name__ == '__main__'
|
|
219
254
|
__package__ == None
|
|
220
255
|
|
|
221
|
-
agent = ApexTrainer(config)
|
|
256
|
+
agent = ApexTrainer(env='registered_env', config=config)
|
|
257
|
+
|
|
258
|
+
from ray.rllib.env.wrappers.multi_agent_env_compatibility import MultiAgentEnvCompatibility
|
|
259
|
+
agent = MultiAgentEnvCompatibility(agent)
|
|
260
|
+
|
|
222
261
|
checkpoint_path = join(wrkspc, 'flopyarcade', 'examples', 'policymodels', ENVTYPE, ENVTYPE)
|
|
262
|
+
print('checkpoint_path', checkpoint_path)
|
|
223
263
|
agent.restore(checkpoint_path)
|
|
224
264
|
|
|
225
265
|
done = False
|
|
@@ -240,4 +280,53 @@ if __name__ == "__main__":
|
|
|
240
280
|
if str(args.suffix) != '':
|
|
241
281
|
cmd = cmd + ' --suffix ' + str(args.suffix)
|
|
242
282
|
|
|
243
|
-
os.system(cmd)
|
|
283
|
+
os.system(cmd)
|
|
284
|
+
|
|
285
|
+
'''
|
|
286
|
+
ValueError: Your environment (<FloPyEnv instance>) does not abide to the new gymnasium-style API!
|
|
287
|
+
From Ray 2.3 on, RLlib only supports the new (gym>=0.26 or gymnasium) Env APIs.
|
|
288
|
+
In particular, the `reset()` method seems to be faulty.
|
|
289
|
+
Learn more about the most important changes here:
|
|
290
|
+
https://github.com/openai/gym and here: https://github.com/Farama-Foundation/Gymnasium
|
|
291
|
+
|
|
292
|
+
In order to fix this problem, do the following:
|
|
293
|
+
|
|
294
|
+
1) Run `pip install gymnasium` on your command line.
|
|
295
|
+
2) Change all your import statements in your code from
|
|
296
|
+
`import gym` -> `import gymnasium as gym` OR
|
|
297
|
+
`from gym.space import Discrete` -> `from gymnasium.spaces import Discrete`
|
|
298
|
+
|
|
299
|
+
For your custom (single agent) gym.Env classes:
|
|
300
|
+
3.1) Either wrap your old Env class via the provided `from gymnasium.wrappers import
|
|
301
|
+
EnvCompatibility` wrapper class.
|
|
302
|
+
3.2) Alternatively to 3.1:
|
|
303
|
+
- Change your `reset()` method to have the call signature 'def reset(self, *,
|
|
304
|
+
seed=None, options=None)'
|
|
305
|
+
- Return an additional info dict (empty dict should be fine) from your `reset()`
|
|
306
|
+
method.
|
|
307
|
+
- Return an additional `truncated` flag from your `step()` method (between `done` and
|
|
308
|
+
`info`). This flag should indicate, whether the episode was terminated prematurely
|
|
309
|
+
due to some time constraint or other kind of horizon setting.
|
|
310
|
+
|
|
311
|
+
For your custom RLlib `MultiAgentEnv` classes:
|
|
312
|
+
4.1) Either wrap your old MultiAgentEnv via the provided
|
|
313
|
+
`from ray.rllib.env.wrappers.multi_agent_env_compatibility import
|
|
314
|
+
MultiAgentEnvCompatibility` wrapper class.
|
|
315
|
+
4.2) Alternatively to 4.1:
|
|
316
|
+
- Change your `reset()` method to have the call signature
|
|
317
|
+
'def reset(self, *, seed=None, options=None)'
|
|
318
|
+
- Return an additional per-agent info dict (empty dict should be fine) from your
|
|
319
|
+
`reset()` method.
|
|
320
|
+
- Rename `dones` into `terminateds` and only set this to True, if the episode is really
|
|
321
|
+
done (as opposed to has been terminated prematurely due to some horizon/time-limit
|
|
322
|
+
setting).
|
|
323
|
+
- Return an additional `truncateds` per-agent dictionary flag from your `step()`
|
|
324
|
+
method, including the `__all__` key (100% analogous to your `dones/terminateds`
|
|
325
|
+
per-agent dict).
|
|
326
|
+
Return this new `truncateds` dict between `dones/terminateds` and `infos`. This
|
|
327
|
+
flag should indicate, whether the episode (for some agent or all agents) was
|
|
328
|
+
terminated prematurely due to some time constraint or other kind of horizon setting.
|
|
329
|
+
|
|
330
|
+
|
|
331
|
+
The above error has been found in your environment! We've added a module for checking your custom environments. It may cause your experiment to fail if your environment is not set up correctly. You can disable this behavior via calling `config.environment(disable_env_checking=True)`. You can run the environment checking module standalone by calling ray.rllib.utils.check_env([your env]).
|
|
332
|
+
'''
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: flopyarcade
|
|
3
|
-
Version: 0.6.
|
|
3
|
+
Version: 0.6.4
|
|
4
4
|
Summary: Simulated groundwater flow environments for reinforcement learning.
|
|
5
5
|
Home-page: https://github.com/philipphoehn/flopyarcade
|
|
6
6
|
Author: Philipp Hoehn
|
|
@@ -22,23 +22,22 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
|
|
|
22
22
|
Classifier: Topic :: Education
|
|
23
23
|
License-File: LICENSE
|
|
24
24
|
Requires-Dist: flopy==3.3.5
|
|
25
|
-
Requires-Dist:
|
|
26
|
-
Requires-Dist:
|
|
27
|
-
Requires-Dist:
|
|
28
|
-
Requires-Dist:
|
|
29
|
-
Requires-Dist:
|
|
30
|
-
Requires-Dist:
|
|
31
|
-
Requires-Dist: matplotlib==3.5.3
|
|
25
|
+
Requires-Dist: gymnasium
|
|
26
|
+
Requires-Dist: imageio
|
|
27
|
+
Requires-Dist: ipython
|
|
28
|
+
Requires-Dist: joblib
|
|
29
|
+
Requires-Dist: lz4
|
|
30
|
+
Requires-Dist: matplotlib
|
|
32
31
|
Requires-Dist: importlib-metadata==4.13.0
|
|
33
|
-
Requires-Dist: numpy
|
|
34
|
-
Requires-Dist: pandas
|
|
35
|
-
Requires-Dist: pathos
|
|
36
|
-
Requires-Dist: pillow
|
|
37
|
-
Requires-Dist: pygame
|
|
38
|
-
Requires-Dist: ray
|
|
39
|
-
Requires-Dist: ray[tune]
|
|
40
|
-
Requires-Dist: ray[rllib]
|
|
41
|
-
Requires-Dist: scikit-image
|
|
42
|
-
Requires-Dist: tensorflow
|
|
43
|
-
Requires-Dist: tqdm
|
|
44
|
-
Requires-Dist: xmipy
|
|
32
|
+
Requires-Dist: numpy
|
|
33
|
+
Requires-Dist: pandas
|
|
34
|
+
Requires-Dist: pathos
|
|
35
|
+
Requires-Dist: pillow
|
|
36
|
+
Requires-Dist: pygame
|
|
37
|
+
Requires-Dist: ray
|
|
38
|
+
Requires-Dist: ray[tune]
|
|
39
|
+
Requires-Dist: ray[rllib]
|
|
40
|
+
Requires-Dist: scikit-image
|
|
41
|
+
Requires-Dist: tensorflow
|
|
42
|
+
Requires-Dist: tqdm
|
|
43
|
+
Requires-Dist: xmipy
|
|
@@ -27,6 +27,10 @@ flopyarcade/examples/policymodels/2s-d/2s-d.tune_metadata
|
|
|
27
27
|
flopyarcade/examples/policymodels/3s-d/.is_checkpoint
|
|
28
28
|
flopyarcade/examples/policymodels/3s-d/3s-d
|
|
29
29
|
flopyarcade/examples/policymodels/3s-d/3s-d.tune_metadata
|
|
30
|
+
flopyarcade/simulators/simulators_linux.zip
|
|
31
|
+
flopyarcade/simulators/simulators_mac.zip
|
|
32
|
+
flopyarcade/simulators/simulators_win32.zip
|
|
33
|
+
flopyarcade/simulators/simulators_win64.zip
|
|
30
34
|
flopyarcade/tests/__init__.py
|
|
31
35
|
flopyarcade/tests/test_agent_dqn.py
|
|
32
36
|
flopyarcade/tests/test_agent_neuroevolution.py
|
|
@@ -19,7 +19,7 @@ from setuptools import find_packages
|
|
|
19
19
|
|
|
20
20
|
# official
|
|
21
21
|
# python setup.py sdist
|
|
22
|
-
# twine upload dist\flopyarcade-0.6.
|
|
22
|
+
# twine upload dist\flopyarcade-0.6.4.tar.gz
|
|
23
23
|
# python -m pip install flopyarcade
|
|
24
24
|
|
|
25
25
|
# using dependency-links did not work (anymore with this pip version)
|
|
@@ -34,7 +34,7 @@ def post_install(package):
|
|
|
34
34
|
|
|
35
35
|
setup(
|
|
36
36
|
name='flopyarcade',
|
|
37
|
-
version='0.6.
|
|
37
|
+
version='0.6.4',
|
|
38
38
|
description='Simulated groundwater flow environments for reinforcement learning.',
|
|
39
39
|
url='https://github.com/philipphoehn/flopyarcade',
|
|
40
40
|
author='Philipp Hoehn',
|
|
@@ -45,27 +45,27 @@ setup(
|
|
|
45
45
|
install_requires=[
|
|
46
46
|
'flopy==3.3.5',
|
|
47
47
|
# https://stackoverflow.com/questions/71411045/how-to-solve-module-gym-wrappers-has-no-attribute-monitor
|
|
48
|
-
'gym==0.22.0', # update breaks playbenchmark
|
|
49
|
-
'gymnasium
|
|
50
|
-
'imageio==2.22.4
|
|
51
|
-
'ipython==7.34.0
|
|
52
|
-
'joblib==1.2.0
|
|
53
|
-
'lz4==4.0.2
|
|
54
|
-
'matplotlib==3.5.3
|
|
48
|
+
# 'gym==0.22.0', # update breaks playbenchmark
|
|
49
|
+
'gymnasium', # update breaks playbenchmark # ==0.29.1
|
|
50
|
+
'imageio', # ==2.22.4
|
|
51
|
+
'ipython', # ==7.34.0 # 8.7.0 on newer Python versions
|
|
52
|
+
'joblib', # ==1.2.0
|
|
53
|
+
'lz4', # ==4.0.2
|
|
54
|
+
'matplotlib', # ==3.5.3 # 3.6.2 on newer Python versions
|
|
55
55
|
# https://stackoverflow.com/questions/73929564/entrypoints-object-has-no-attribute-get-digital-ocean
|
|
56
56
|
'importlib-metadata==4.13.0', # update breaks
|
|
57
|
-
'numpy==1.21.6
|
|
58
|
-
'pandas==1.3.5
|
|
59
|
-
'pathos==0.3.0
|
|
60
|
-
'pillow==9.3.0
|
|
61
|
-
'pygame==2.1.2
|
|
62
|
-
'ray==1.9.2
|
|
63
|
-
'ray[tune]==1.9.2
|
|
64
|
-
'ray[rllib]==1.9.2
|
|
65
|
-
'scikit-image==0.19.3
|
|
66
|
-
'tensorflow==2.11.0
|
|
67
|
-
'tqdm==4.64.1
|
|
68
|
-
'xmipy==1.3.0
|
|
57
|
+
'numpy', # ==1.21.6 # 1.22.0 on newer Python versions
|
|
58
|
+
'pandas', # ==1.3.5 # 1.5.2 on newer Python versions
|
|
59
|
+
'pathos', # ==0.3.0
|
|
60
|
+
'pillow', # ==9.3.0
|
|
61
|
+
'pygame', # ==2.1.2
|
|
62
|
+
'ray', # ==1.9.2 # 2.1.0 requires new benchmark checkpoints
|
|
63
|
+
'ray[tune]', # ==1.9.2 # 2.1.0 requires new benchmark checkpoints
|
|
64
|
+
'ray[rllib]', # ==1.9.2 # 2.1.0 requires new benchmark checkpoints
|
|
65
|
+
'scikit-image', # ==0.19.3
|
|
66
|
+
'tensorflow', # ==2.11.0
|
|
67
|
+
'tqdm', # ==4.64.1
|
|
68
|
+
'xmipy', # ==1.3.0 # 1.2.0 # update breaks # 1.0.0 worked before?
|
|
69
69
|
],
|
|
70
70
|
|
|
71
71
|
classifiers=[
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
flopy==3.3.5
|
|
2
|
-
gym==0.22.0
|
|
3
|
-
gymnasium==0.29.1
|
|
4
|
-
imageio==2.22.4
|
|
5
|
-
ipython==7.34.0
|
|
6
|
-
joblib==1.2.0
|
|
7
|
-
lz4==4.0.2
|
|
8
|
-
matplotlib==3.5.3
|
|
9
|
-
importlib-metadata==4.13.0
|
|
10
|
-
numpy==1.21.6
|
|
11
|
-
pandas==1.3.5
|
|
12
|
-
pathos==0.3.0
|
|
13
|
-
pillow==9.3.0
|
|
14
|
-
pygame==2.1.2
|
|
15
|
-
ray==1.9.2
|
|
16
|
-
ray[tune]==1.9.2
|
|
17
|
-
ray[rllib]==1.9.2
|
|
18
|
-
scikit-image==0.19.3
|
|
19
|
-
tensorflow==2.11.0
|
|
20
|
-
tqdm==4.64.1
|
|
21
|
-
xmipy==1.3.0
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/1s-d/.is_checkpoint
RENAMED
|
File without changes
|
|
File without changes
|
{flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/1s-d/1s-d.tune_metadata
RENAMED
|
File without changes
|
{flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/2s-d/.is_checkpoint
RENAMED
|
File without changes
|
{flopyarcade-0.6.2 → flopyarcade-0.6.4}/flopyarcade/examples/policymodels/3s-d/.is_checkpoint
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|