Merge pull request #68 from jasmcaus/dev

Dev

.github/workflows/docs.yml

@@ -29,8 +29,8 @@ jobs:
     #   - name: Install Reqs
     #     run: |
     #       python -m pip install --upgrade pip
-    #       python -m pip install -r requirements/default.txt
-    #       python -m pip install -r requirements/build-docs.txt
+    #       python -m pip install -r tools/requirements/default.txt
+    #       python -m pip install -r tools/requirements/build-docs.txt
     #       python -m pip install .
 
     #   - name: Building Docs

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
       shell: bash -l {0}
       run: |
         conda install curl make -c conda-forge
-        pip install -r requirements/test.txt
+        pip install -r tools/requirements/test.txt
         make install
 
     - name: Run Tests

.pylintrc

@@ -16,7 +16,8 @@ disable=R,
     no-name-in-module,
     invalid-unary-operand-type,
     redefined-outer-name,
-    pointless-string-statement
+    pointless-string-statement,
+    unspecified-encoding
 
 # disable=R,
 #         C,

.readthedocs.yml

@@ -19,5 +19,5 @@ formats:
 python:
   version: 3.7
   install:
-    - requirements: requirements/default.txt
-    - requirements: requirements/build-docs.txt
+    - requirements: tools/requirements/default.txt
+    - requirements: tools/requirements/build-docs.txt

caer/__init__.py

@@ -18,8 +18,6 @@
     Colorspace manipulation
 data
     Standard high-quality test images
-filters
-    Advanced Image Filters
 path
     OS-specific Path Manipulations
 preprocessing
@@ -93,22 +91,11 @@ def copyright():
 from .preprocess import (
     preprocess_from_dir,
     sep_train,
-    shuffle,
-    reshape,
-    normalize,
     __all__ as __all_preprocess__
 )
 
 # General utilities
 from .core import (
-    median,
-    mean,
-    merge,
-    split,
-    npmean,
-    to_array,
-    array,
-    asarray,
     train_val_split,
     get_classes_from_dir,
     sort_dict,
@@ -219,7 +206,6 @@ def get_caer_methods():
 
 from .transforms import __all__ as __all_transforms__
 from .data import __all__ as __all_data__
-# from .filters import __all__ as __all_filters__
 from .path import __all__ as __all_path__
 from .preprocessing import __all__ as __all_preprocessing__
 from .video import __all__ as __all_video__
@@ -230,7 +216,6 @@ def get_caer_methods():
 __all__ += __all_transforms__
 __all__ += __all_color__
 __all__ += __all_data__
-# __all__ += __all_filters__
 __all__ += __all_io__
 __all__ += __all_path__
 __all__ += __all_preprocessing__
@@ -253,6 +238,5 @@ def get_caer_methods():
 del __all_transforms__
 del __all_color__
 del __all_data__
-# del __all_filters__
 del __all_preprocessing__
 del __all_video__

caer/_base.py

@@ -11,7 +11,7 @@
 
 
 # We don't want to modify the root dir in any way 
-# This gets distrupted if this file is called directly
+# This gets disrupted if this file is called directly
 # Checks are in place:
 
 if __name__ != '__main__':

caer/_meta.py

@@ -3,9 +3,9 @@
 # Copyright 2020-2021, Caer
 author = 'Jason Dsouza'
 author_email = 'jasmcaus@gmail.com'
-version = '1.9.8'
-full_version = '1.9.8'
-git_version = 'f5b45305206dab24317928633e6a98074cd79a7b'
+version = '1.9.9'
+full_version = '1.9.9'
+git_version = 'aaf0eafd5df0de00930921a1586ef2dc102ab6fc'
 release = True
-contributors = ['Jason Dsouza <jasmcaus@gmail.com>', '', 'Malik M Alnakhaleh <@MalikMAlna>']
+contributors = ['Jason Dsouza <@jasmcaus>', '', 'Special Thanks to:', '@MalikMAlna', '@lucasace', '@GitHubDragonFly']
 homepage = 'https://github.com/jasmcaus/caer'

caer/core.py

@@ -38,7 +38,7 @@
 def median(arr, axis=None):
     return np.median(arr, axis=axis)
 
-
+ 
 def mean(image, mask=None):
     try:
         return cv.mean(image, mask=mask)
@@ -52,30 +52,6 @@ def merge(tens):
 
     return cv.merge(tens)
 
-
-def split(tens):
-    try:
-        return cv.split(tens)
-    except:
-        raise ValueError('mean() expects an image')
-
-
-def npmean(arr):
-    return np.mean(arr)
-
-
-def array(obj, dtype=None, order='K'):
-    return np.array(obj, dtype=dtype, order=order)
-
-
-def to_array(obj, dtype=None, order='K'):
-    return np.array(obj, dtype=dtype, order=order)
-
-
-def asarray(obj, dtype=None, order=None):
-    return np.asarray(obj, dtype=dtype, order=order)
-
-
 def get_classes_from_dir(DIR, verbose=0):
     if len(listdir(DIR, verbose=0)) == 0:
         raise ValueError('The specified directory does not seem to have any folders in it')
@@ -104,9 +80,6 @@ def train_val_split(X, y, val_ratio=.2):
     data = [] 
     for i in range(len(X)):
         data.append([X[i], y[i]])
-
-    # import random
-    # random.shuffle(data)
 
     split = int(len(X) - (len(X) * val_ratio)) - 1
 
@@ -116,6 +89,8 @@ def train_val_split(X, y, val_ratio=.2):
     X_train, y_train = _sep(data_train)
     X_val, y_val = _sep(data_test)
 
+    del data
+
     return X_train, X_val, y_train, y_val
 
 
@@ -161,25 +136,4 @@ def edges(tens, threshold1=None, threshold2=None, use_median=True, sigma=None):
     else:
         canny_edges = cv.Canny(tens, threshold1, threshold2)
 
-    return canny_edges
-
-
-# def energy_map(tens):
-#     tens = bgr_to_gray(tens.astype(np.uint8))
-
-#     dx = cv.Sobel(tens, cv.CV_16S, 1, 0, ksize=3)
-#     abs_x = cv.convertScaleAbs(dx)
-#     dy = cv.Sobel(tens, cv.CV_16S, 0, 1, ksize=3)
-#     abs_y = cv.convertScaleAbs(dy)
-#     output = cv.addWeighted(abs_x, 0.5, abs_y, 0.5, 0)
-
-#     return output
-
-
-# def color_map(tens):
-#     gray_tens = bgr_to_gray(tens) 
-
-#     heatmap = cv.applyColorMap(gray_tens, 11)
-#     superimpose = cv.addWeighted(heatmap, 0.7, tens, 0.3, 0)
-
-#     return superimpose
+    return canny_edges