Commit ba69f14f authored by lukas leufen's avatar lukas leufen 👻
Browse files

new packages in reqs, halve data loading in make prediction

parent 90fb789c
Pipeline #101687 passed with stages
in 11 minutes and 17 seconds
......@@ -2,9 +2,11 @@ astropy==4.1
bottleneck==1.3.2
cached-property==1.5.2
iniconfig==1.1.1
multiprocess==0.70.12.2
multiprocess==0.70.11
ordered-set==4.0.2
pathos==0.2.7
pox==0.2.9
ppft==1.6.6.3
pyshp==2.1.3
pytest-html==3.1.1
pytest-lazy-fixture==0.6.3
......
......@@ -2,9 +2,11 @@ astropy==4.1
bottleneck==1.3.2
cached-property==1.5.2
iniconfig==1.1.1
multiprocess==0.70.12.2
multiprocess==0.70.11
ordered-set==4.0.2
pathos==0.2.7
pox==0.2.9
ppft==1.6.6.3
pyshp==2.1.3
pytest-html==3.1.1
pytest-lazy-fixture==0.6.3
......
......@@ -125,8 +125,9 @@ class DefaultDataHandler(AbstractDataHandler):
def get_data(self, upsampling=False, as_numpy=True):
self._load()
X = self.get_X(upsampling, as_numpy)
Y = self.get_Y(upsampling, as_numpy)
as_numpy_X, as_numpy_Y = as_numpy if isinstance(as_numpy, tuple) else (as_numpy, as_numpy)
X = self.get_X(upsampling, as_numpy_X)
Y = self.get_Y(upsampling, as_numpy_Y)
self._reset_data()
return X, Y
......
......@@ -1329,8 +1329,9 @@ def f_proc_make_prediction(data, frequency, time_dimension, forecast_indicator,
prediction_maker = MakePrediction(model, window_lead_time, ols_model)
input_data = data.get_X()
target_data = data.get_Y(as_numpy=False)
input_data, target_data = data.get_data(as_numpy=(True, False))
# input_data = data.get_X()
# target_data = data.get_Y(as_numpy=False)
observation_data = data.get_observation()
# get scaling parameters
......
......@@ -9,12 +9,14 @@ keras_nightly==2.5.0.dev2021032900
locket==0.2.1
matplotlib==3.3.4
mock==4.0.3
multiprocess==0.70.12.2
multiprocess==0.70.11
netcdf4==1.5.8
numpy==1.19.5
pandas==1.1.5
partd==1.2.0
pathos==0.2.7
pox==0.2.9
ppft==1.6.6.3
psutil==5.8.0
pydot==1.4.2
pytest==6.2.2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment