[Fix] Bugfix about requirements / to_uint8 and clean (#123)

* [Fix] Fix setup error about .version

* [Fix] Update requirements

* [Clean] Remove old tool

* [Fix] Fix to_uint8

* [Fix] Fix to_uint8

* Update functions.py

* Update functions.py

* Update functions.py

* Update functions.py

* Update functions.py

paddlers/transforms/functions.py

@@ -430,6 +430,8 @@ def to_uint8(im, norm=True, stretch=False):
         return stretched_img
 
     dtype = im.dtype.name
+    if dtype == "uint8" and !stretch:
+        return im
     if dtype != "uint8" and norm:
         im = _sample_norm(im)
     if stretch:

requirements.txt

@@ -11,13 +11,13 @@ motmetrics
 munch
 natsort
 numba >= 0.56.2
-opencv-contrib-python >= 4.3.0
+opencv-contrib-python <= 4.3.0.28
 openpyxl
 # paddlepaddle >= 2.2.0
 # paddlepaddle-gpu >= 2.2.0
 paddleslim >= 2.2.1, < 2.3.5
 pandas
-protobuf >= 3.1.0, <= 4.22.1
+protobuf >= 3.1.0, <= 3.20.3
 pycocotools
 # pydensecrf
 scikit-learn

tools/mask2geojson.py

@@ -1,73 +0,0 @@
-# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed 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 os
-import codecs
-import argparse
-
-import paddlers
-import numpy as np
-import cv2
-import geojson
-from tqdm import tqdm
-
-from utils import Raster, save_geotiff, translate_vector, time_it
-
-
-def _gt_convert(x_geo, y_geo, geotf):
-    a = np.array([[geotf[1], geotf[2]], [geotf[4], geotf[5]]])
-    b = np.array([x_geo - geotf[0], y_geo - geotf[3]])
-    return np.round(np.linalg.solve(a,
-                                    b)).tolist()  # Solve a quadratic equation
-
-
-@time_it
-# TODO: update for vector2raster
-def convert_data(image_path, geojson_path):
-    raster = Raster(image_path)
-    tmp_img = np.zeros((raster.height, raster.width), dtype=np.int32)
-    # vector to EPSG from raster
-    temp_geojson_path = translate_vector(geojson_path, raster.proj)
-    geo_reader = codecs.open(temp_geojson_path, "r", encoding="utf-8")
-    feats = geojson.loads(geo_reader.read())["features"]  # All image patches
-    geo_reader.close()
-    for feat in tqdm(feats):
-        geo = feat["geometry"]
-        if geo["type"] == "Polygon":
-            geo_points = geo["coordinates"][0]
-        elif geo["type"] == "MultiPolygon":
-            geo_points = geo["coordinates"][0][0]
-        else:
-            raise TypeError(
-                "Geometry type must be 'Polygon' or 'MultiPolygon', not {}.".
-                format(geo["type"]))
-        xy_points = np.array([
-            _gt_convert(point[0], point[1], raster.geot) for point in geo_points
-        ]).astype(np.int32)
-        # TODO: Label category
-        cv2.fillPoly(tmp_img, [xy_points], 1)  # Fill with polygons
-    ext = "." + geojson_path.split(".")[-1]
-    save_geotiff(tmp_img,
-                 geojson_path.replace(ext, ".tif"), raster.proj, raster.geot)
-    os.remove(temp_geojson_path)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--mask_path", type=str, required=True, \
-                        help="Path of mask data.")
-    parser.add_argument("--save_path", type=str, required=True, \
-                        help="Path to store the GeoJSON file (the coordinate system is WGS84).")
-    args = parser.parse_args()
-    convert_data(args.mask_path, args.save_path)