You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sdap.apache.org by GitBox <gi...@apache.org> on 2018/03/01 02:33:58 UTC

[GitHub] ntquach closed pull request #2: SDAP-26 Create new ningesterpy processor to delete axis from data array

ntquach closed pull request #2: SDAP-26 Create new ningesterpy processor to delete axis from data array
URL: https://github.com/apache/incubator-sdap-ningesterpy/pull/2
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/sdap/processors/__init__.py b/sdap/processors/__init__.py
index 8f30cb8..8a48500 100644
--- a/sdap/processors/__init__.py
+++ b/sdap/processors/__init__.py
@@ -52,6 +52,7 @@ def process_nexus_tile(self, nexus_tile):
 from sdap.processors.callncpdq import CallNcpdq
 from sdap.processors.callncra import CallNcra
 from sdap.processors.computespeeddirfromuv import ComputeSpeedDirFromUV
+from sdap.processors.deleteunitaxis import DeleteUnitAxis
 from sdap.processors.emptytilefilter import EmptyTileFilter
 from sdap.processors.kelvintocelsius import KelvinToCelsius
 from sdap.processors.normalizetimebeginningofmonth import NormalizeTimeBeginningOfMonth
@@ -65,6 +66,7 @@ def process_nexus_tile(self, nexus_tile):
     "CallNcpdq": CallNcpdq,
     "CallNcra": CallNcra,
     "ComputeSpeedDirFromUV": ComputeSpeedDirFromUV,
+    "DeleteUnitAxis": DeleteUnitAxis,
     "EmptyTileFilter": EmptyTileFilter,
     "KelvinToCelsius": KelvinToCelsius,
     "NormalizeTimeBeginningOfMonth": NormalizeTimeBeginningOfMonth,
diff --git a/sdap/processors/deleteunitaxis.py b/sdap/processors/deleteunitaxis.py
new file mode 100644
index 0000000..602f71b
--- /dev/null
+++ b/sdap/processors/deleteunitaxis.py
@@ -0,0 +1,43 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import numpy
+from nexusproto.serialization import from_shaped_array, to_shaped_array
+
+from sdap.processors import NexusTileProcessor
+
+
+class DeleteUnitAxis(NexusTileProcessor):
+
+    def __init__(self, dimension, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.dimension = dimension
+
+    def process_nexus_tile(self, nexus_tile):
+        axis = [x.split(':')[0] for x in nexus_tile.summary.section_spec.split(',')].index(self.dimension)
+
+        the_tile_type = nexus_tile.tile.WhichOneof("tile_type")
+
+        the_tile_data = getattr(nexus_tile.tile, the_tile_type)
+
+        var_data = from_shaped_array(the_tile_data.variable_data)
+
+        if numpy.size(var_data, axis) == 1:
+            the_tile_data.variable_data.CopyFrom(to_shaped_array(numpy.squeeze(var_data, axis=axis)))
+        else:
+            raise RuntimeError("Cannot delete axis for dimension %s because length is not 1." % self.dimension)
+
+        yield nexus_tile
diff --git a/tests/deleteunitaxis_test.py b/tests/deleteunitaxis_test.py
new file mode 100644
index 0000000..69d4f7e
--- /dev/null
+++ b/tests/deleteunitaxis_test.py
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+from os import path
+
+from nexusproto import DataTile_pb2 as nexusproto
+from nexusproto.serialization import from_shaped_array
+
+import sdap.processors
+
+
+class TestDeleteTimeAxis(unittest.TestCase):
+    def setUp(self):
+        self.module = sdap.processors.DeleteUnitAxis("time")
+
+    def test_delete_time_axis(self):
+        test_file = path.join(path.dirname(__file__), 'dumped_nexustiles', 'avhrr_nonempty_nexustile.bin')
+
+        with open(test_file, 'rb') as f:
+            nexustile_str = f.read()
+
+        nexus_tile_before = nexusproto.NexusTile.FromString(nexustile_str)
+
+        sst_before = from_shaped_array(nexus_tile_before.tile.grid_tile.variable_data)
+
+        self.assertEqual((1, 10, 10), sst_before.shape)
+
+        results = list(self.module.process(nexustile_str))
+
+        nexus_tile_after = results[0]
+
+        sst_after = from_shaped_array(nexus_tile_after.tile.grid_tile.variable_data)
+
+        self.assertEqual((10, 10), sst_after.shape)
+
+
+if __name__ == '__main__':
+    unittest.main()


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services