From e6e72799403407f7f23bab84d90d779da46e62eb Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 19:30:00 -0500 Subject: [PATCH 1/6] Remove apache-beam from dependencies to prevent Colab install error --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index deb2835..8d45003 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,6 @@ INSTALL_REQUIRES = [ 'absl-py', - 'apache-beam', 'numpy', 'scipy', 'xarray', From 6ffca4c7fb911a2f79e03c60f7b7de5af8651ae6 Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 19:33:24 -0500 Subject: [PATCH 2/6] Do not import pipelines in case beam is not installed --- datadrivenpdes/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/datadrivenpdes/__init__.py b/datadrivenpdes/__init__.py index c9c374e..c198032 100644 --- a/datadrivenpdes/__init__.py +++ b/datadrivenpdes/__init__.py @@ -1,4 +1,3 @@ """2D PDE superresolution models.""" from datadrivenpdes import advection from datadrivenpdes import core -from datadrivenpdes import pipelines From a85fe5f1004ad51134aba4f2c37b1513d6b2c1a4 Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 19:51:28 -0500 Subject: [PATCH 3/6] Revert "Do not import pipelines in case beam is not installed" This reverts commit 6ffca4c7fb911a2f79e03c60f7b7de5af8651ae6. --- datadrivenpdes/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/datadrivenpdes/__init__.py b/datadrivenpdes/__init__.py index c198032..c9c374e 100644 --- a/datadrivenpdes/__init__.py +++ b/datadrivenpdes/__init__.py @@ -1,3 +1,4 @@ """2D PDE superresolution models.""" from datadrivenpdes import advection from datadrivenpdes import core +from datadrivenpdes import pipelines From 57678fcd2e886d8a89e22618e76bb0f0490c9b6a Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 19:52:56 -0500 Subject: [PATCH 4/6] Only attempt to import beam, in case it is not installed --- datadrivenpdes/pipelines/create_training_data.py | 3 ++- datadrivenpdes/pipelines/create_training_data_test.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/datadrivenpdes/pipelines/create_training_data.py b/datadrivenpdes/pipelines/create_training_data.py index a16d536..9d32cfa 100644 --- a/datadrivenpdes/pipelines/create_training_data.py +++ b/datadrivenpdes/pipelines/create_training_data.py @@ -19,7 +19,8 @@ from absl import app from absl import flags -import apache_beam as beam +try: + import apache_beam as beam import numpy as np from datadrivenpdes.core import builders from datadrivenpdes.core import equations diff --git a/datadrivenpdes/pipelines/create_training_data_test.py b/datadrivenpdes/pipelines/create_training_data_test.py index 97f2553..8619e5f 100644 --- a/datadrivenpdes/pipelines/create_training_data_test.py +++ b/datadrivenpdes/pipelines/create_training_data_test.py @@ -19,7 +19,8 @@ from absl import flags from absl.testing import flagsaver from absl.testing import parameterized -import apache_beam as beam +try: + import apache_beam as beam from datadrivenpdes.core import builders from datadrivenpdes.pipelines import create_training_data from tensorflow import gfile From 6e06d184d07dc8cc9b9831f0272004a443a31987 Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 19:59:35 -0500 Subject: [PATCH 5/6] Catch all beam imports --- datadrivenpdes/pipelines/beamlib.py | 7 ++++++- datadrivenpdes/pipelines/create_training_data.py | 4 ++++ datadrivenpdes/pipelines/create_training_data_test.py | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/datadrivenpdes/pipelines/beamlib.py b/datadrivenpdes/pipelines/beamlib.py index 7634205..e83288a 100644 --- a/datadrivenpdes/pipelines/beamlib.py +++ b/datadrivenpdes/pipelines/beamlib.py @@ -14,7 +14,12 @@ # limitations under the License. # ============================================================================== """Beam utilities.""" -import apache_beam as beam + +try: + import apache_beam as beam +except: + pass + import numpy as np from typing import List, Tuple diff --git a/datadrivenpdes/pipelines/create_training_data.py b/datadrivenpdes/pipelines/create_training_data.py index 9d32cfa..3b3c00e 100644 --- a/datadrivenpdes/pipelines/create_training_data.py +++ b/datadrivenpdes/pipelines/create_training_data.py @@ -19,8 +19,12 @@ from absl import app from absl import flags + try: import apache_beam as beam +except: + pass + import numpy as np from datadrivenpdes.core import builders from datadrivenpdes.core import equations diff --git a/datadrivenpdes/pipelines/create_training_data_test.py b/datadrivenpdes/pipelines/create_training_data_test.py index 8619e5f..c1e90d9 100644 --- a/datadrivenpdes/pipelines/create_training_data_test.py +++ b/datadrivenpdes/pipelines/create_training_data_test.py @@ -19,8 +19,12 @@ from absl import flags from absl.testing import flagsaver from absl.testing import parameterized + try: import apache_beam as beam +except: + pass + from datadrivenpdes.core import builders from datadrivenpdes.pipelines import create_training_data from tensorflow import gfile From c1962f9bfb197c3a27fe51326a26c2dfc6ebd551 Mon Sep 17 00:00:00 2001 From: JiaweiZhuang Date: Wed, 12 Feb 2020 20:05:39 -0500 Subject: [PATCH 6/6] Skip beamlib import --- datadrivenpdes/pipelines/__init__.py | 1 - datadrivenpdes/pipelines/beamlib.py | 6 +----- datadrivenpdes/pipelines/create_training_data.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/datadrivenpdes/pipelines/__init__.py b/datadrivenpdes/pipelines/__init__.py index 5278647..547ed1f 100644 --- a/datadrivenpdes/pipelines/__init__.py +++ b/datadrivenpdes/pipelines/__init__.py @@ -1,3 +1,2 @@ """Training and evaluation pipelines.""" -from datadrivenpdes.pipelines import beamlib from datadrivenpdes.pipelines import model_utils diff --git a/datadrivenpdes/pipelines/beamlib.py b/datadrivenpdes/pipelines/beamlib.py index e83288a..c9d2b07 100644 --- a/datadrivenpdes/pipelines/beamlib.py +++ b/datadrivenpdes/pipelines/beamlib.py @@ -15,11 +15,7 @@ # ============================================================================== """Beam utilities.""" -try: - import apache_beam as beam -except: - pass - +import apache_beam as beam import numpy as np from typing import List, Tuple diff --git a/datadrivenpdes/pipelines/create_training_data.py b/datadrivenpdes/pipelines/create_training_data.py index 3b3c00e..dffe7eb 100644 --- a/datadrivenpdes/pipelines/create_training_data.py +++ b/datadrivenpdes/pipelines/create_training_data.py @@ -22,6 +22,7 @@ try: import apache_beam as beam + from datadrivenpdes.pipelines import beamlib except: pass @@ -29,7 +30,6 @@ from datadrivenpdes.core import builders from datadrivenpdes.core import equations from datadrivenpdes.core import grids -from datadrivenpdes.pipelines import beamlib import tensorflow as tf # Ensure Equation subclasses are defined so we can look them up by name.