linux fix

.idea/csv-plugin.xml

@@ -3,6 +3,13 @@
   <component name="CsvFileAttributes">
     <option name="attributeMap">
       <map>
+        <entry key="/install.bat">
+          <value>
+            <Attribute>
+              <option name="separator" value=";" />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="C:\Users\Kritik Soman\AppData\Roaming\JetBrains\PyCharmCE2020.2\scratches\backtranslate.py">
           <value>
             <Attribute>

gimpml/plugins/coloring/coloring.py

@@ -60,7 +60,7 @@ def coloring(procedure, image, n_drawables, drawables, force_cpu, progress_bar):
             GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
             GObject.Value(Gimp.Image, image),
             GObject.Value(GObject.TYPE_INT, 1),
-            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 1)),
+            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 0)),
             GObject.Value(Gio.File,
                           Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache' + str(index) + '.png'))),
             GObject.Value(GObject.TYPE_BOOLEAN, interlace),

gimpml/plugins/deblur/deblur.py

@@ -49,7 +49,7 @@ def deblur(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/dehaze/dehaze.py

@@ -49,7 +49,7 @@ def dehaze(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/denoise/denoise.py

@@ -49,7 +49,7 @@ def denoise(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/enlighten/enlighten.py

@@ -49,7 +49,7 @@ def enlighten(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/faceparse/faceparse.py

@@ -49,7 +49,7 @@ def faceparse(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/inpainting/inpainting.py

@@ -60,7 +60,7 @@ def inpainting(procedure, image, n_drawables, drawables, force_cpu, progress_bar
             GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
             GObject.Value(Gimp.Image, image),
             GObject.Value(GObject.TYPE_INT, 1),
-            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 1)),
+            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 0)),
             GObject.Value(Gio.File,
                           Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache' + str(index) + '.png'))),
             GObject.Value(GObject.TYPE_BOOLEAN, interlace),

gimpml/plugins/interpolation/interpolation.py

@@ -60,7 +60,7 @@ def interpolation(procedure, image, n_drawables, drawables, force_cpu, progress_
             GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
             GObject.Value(Gimp.Image, image),
             GObject.Value(GObject.TYPE_INT, 1),
-            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 1)),
+            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 0)),
             GObject.Value(Gio.File,
                           Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache' + str(index) + '.png'))),
             GObject.Value(GObject.TYPE_BOOLEAN, interlace),
@@ -77,16 +77,16 @@ def interpolation(procedure, image, n_drawables, drawables, force_cpu, progress_
 
     subprocess.call([python_path, plugin_path])
 
-    result = Gimp.file_load(Gimp.RunMode.NONINTERACTIVE,
-                            Gio.file_new_for_path(os.path.join(weight_path, '..', 'cache.png')))
-    result_layer = result.get_active_layer()
-    copy = Gimp.Layer.new_from_drawable(result_layer, image)
-    copy.set_name("interpolation")
-    copy.set_mode(Gimp.LayerMode.NORMAL_LEGACY)  # DIFFERENCE_LEGACY
-    image.insert_layer(copy, None, -1)
-
-    image.undo_group_end()
-    Gimp.context_pop()
+    # result = Gimp.file_load(Gimp.RunMode.NONINTERACTIVE,
+    #                         Gio.file_new_for_path(os.path.join(weight_path, '..', 'cache.png')))
+    # result_layer = result.get_active_layer()
+    # copy = Gimp.Layer.new_from_drawable(result_layer, image)
+    # copy.set_name("interpolation")
+    # copy.set_mode(Gimp.LayerMode.NORMAL_LEGACY)  # DIFFERENCE_LEGACY
+    # image.insert_layer(copy, None, -1)
+    #
+    # image.undo_group_end()
+    # Gimp.context_pop()
 
     return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error())
 

gimpml/plugins/kmeans/kmeans.py

@@ -106,7 +106,7 @@ def k_means(procedure, image, drawable, n_cluster, position, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/matting/matting.py

@@ -60,7 +60,7 @@ def matting(procedure, image, n_drawables, drawables, force_cpu, progress_bar):
             GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
             GObject.Value(Gimp.Image, image),
             GObject.Value(GObject.TYPE_INT, 1),
-            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 1)),
+            GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, [drawable], 0)),
             GObject.Value(Gio.File,
                           Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache' + str(index) + '.png'))),
             GObject.Value(GObject.TYPE_BOOLEAN, interlace),

gimpml/plugins/monodepth/monodepth.py

@@ -49,7 +49,7 @@ def monodepth(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/semseg/semseg.py

@@ -49,7 +49,7 @@ def semseg(procedure, image, drawable, force_cpu, progress_bar):
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/plugins/superresolution/superresolution.py

@@ -123,7 +123,7 @@ def super_resolution(procedure, image, drawable, scale, filter, force_cpu, progr
         GObject.Value(Gimp.RunMode, Gimp.RunMode.NONINTERACTIVE),
         GObject.Value(Gimp.Image, image),
         GObject.Value(GObject.TYPE_INT, 1),
-        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 1)),
+        GObject.Value(Gimp.ObjectArray, Gimp.ObjectArray.new(Gimp.Drawable, drawable, 0)),
         GObject.Value(Gio.File, Gio.File.new_for_path(os.path.join(weight_path, '..', 'cache.png'))),
         GObject.Value(GObject.TYPE_BOOLEAN, interlace),
         GObject.Value(GObject.TYPE_INT, compression),

gimpml/tools/complete_install.py

@@ -26,11 +26,14 @@ def setup_python_weights(install_location=None):
     if not os.path.isdir(weight_path):
         os.mkdir(weight_path)
 
+    step = 1
     if os.name == 'nt':  # windows
-        print("\n##########\n1>> Automatic downloading of weights not supported on Windows.")
-        print("2>> Please downloads weights folder from: \n"
-              "https://drive.google.com/drive/folders/10IiBO4fuMiGQ-spBStnObbk9R-pGp6u8?usp=sharing")
+        print("\n##########\n{}>> Automatic downloading of weights not supported on Windows.".format(step))
+        step += 1
+        print("{}>> Please downloads weights folder from: \n"
+              "https://drive.google.com/drive/folders/10IiBO4fuMiGQ-spBStnObbk9R-pGp6u8?usp=sharing".format(step))
         print("and place in: " + weight_path)
+        step += 1
     else:  # linux
         file_path = os.path.dirname(os.path.realpath(__file__))
         with open(os.path.join(file_path, 'model_info.csv')) as csv_file:
@@ -38,13 +41,13 @@ def setup_python_weights(install_location=None):
             headings = next(csv_reader)
             line_count = 0
             for row in csv_reader:
-                model = row[0]
+                model = os.path.join(*row[0].split("/"))
                 file_id = row[1]
                 fileSize = float(row[2])  # in MB
                 mFName = row[3]
                 md5sum = row[4]
                 if not os.path.isdir(os.path.join(weight_path, model)):
-                    os.mkdir(os.path.join(weight_path, model))
+                    os.makedirs(os.path.join(weight_path, model))
                 destination = os.path.join(os.path.join(weight_path, model), mFName)
                 if os.path.isfile(destination):
                     md5_hash = hashlib.md5()
@@ -63,7 +66,7 @@ def setup_python_weights(install_location=None):
     with open(os.path.join(plugin_loc, 'gimp_ml_config.pkl'), 'wb') as file:
         pickle.dump({"python_path": python_path, "weight_path": weight_path}, file)
 
-    print("3>> Please add this path to Preferences-->Plug-ins : ",
+    print("{}>> Please add this path to Preferences --> Plug-ins in GIMP : ".format(step),
           os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "plugins"))
     print("##########\n")
 

gimpml/tools/model_info.csv

@@ -7,11 +7,22 @@ faceparse,115nnWD0FoDkplTJYBY7lTQu1VNXFbCA_,51,79999_iter.pth,ff26a222ce48a618a1
 deblur,11Tt4a_URCer4ZxZA2l3dLMRVeSwoBFYP,233,mymodel.pth,190be4c1b076ffd7b1cb5e40ea31ce4c
 deblur,11MCHMVhs4aaMGSusqiu0rtAo97xuC1GA,234,best_fpn.h5,96f747f38a0119669265cbb5fc7b3c5c
 deeplabv3,11rX1MHjhmtaoFTQ7ao4p6b31Oz300i0G,233,deeplabv3+model.pt,32f62b9f15f2e39085476d71b902c83c
-facegen,122dREA3R0vsSWbrzBwhF5oqSEJ7yrRbL,342,latest_net_G.pth,0ef87488e7d82366ac3ae0449eac367e
 deepdehaze,1hrd310nYCbh6ui_ZsZci7Zna2AFP1sMS,0.008,dehazer.pth,77a898308869d223fdda17436eae34ee
 deepdenoise,1acZ1FTNMuAQaYtE3RYLA8fs8cQrW2tZ_,0.166,est_net.pth,bf681d25ed09015b9b152b991fc032a8
 deepdenoise,1tBoyDxYJ92pvopBJeK9PmG_jMA_Ut38_,3,net.pth,bbca3ca4b3a92a5a26af605cbf823242
 enlightening,1V8ARc2tDgUUpc11xiT5Y9HFQgC6Ug2T6,35,200_net_G_A.pth,5e3e6d3ab04492f4a693316515ac8571
 interpolateframes,1bHmO9-_ENTYoN1-BNwSk3nLN9-NDUnRg,1.6,contextnet.pkl,e0a3353054c460b4600ab57c686c4f7e
 interpolateframes,1cQvDPBKsz3TAi0Q5bJXsu6A-Z7lpk_cE,25.4,flownet.pkl,f3e13948d14bb5f0bf3fa7da455f1649
-interpolateframes,1mlA8VtxIcvJfz51OsQMvWX24oqxZ429r,15,unet.pkl,491a6e475fc88eb6ff587d1912a60ff7
+interpolateframes,1mlA8VtxIcvJfz51OsQMvWX24oqxZ429r,15,unet.pkl,491a6e475fc88eb6ff587d1912a60ff7
+edgeconnect/places2,1cmaFsyjKpC6wQhCiuITUI_pmC7g54eOU,10.8,EdgeModel_dis.pth,5777b1d8fd48ec684899c80cf8e0af60
+edgeconnect/places2,1z4xI1P-LfOpZRsc6hHjcGMS37PxOMePG,42.2,EdgeModel_gen.pth,8ae8a8f5f73b2c23bb20fe64e9662c36
+edgeconnect/places2,1NkK9WMOEiPUfcp5Ga3cmesabb8C4g2yC,10.8,InpaintingModel_dis.pth,ec8203fca31511050d116698bb56344b
+edgeconnect/places2,1bfLDxISWagkkHj5SlFz3Oc26C15HVsYu,42,InpaintingModel_gen.pth,f681314e7ff76c13302096ebf49dff2d
+edgeconnect/celeba,1n_zyNXKiMG_lWekW6WepCuDGUSaK3zJK,10.8,EdgeModel_dis.pth,e3d40f777c618eac1e0a92a8b3c067b0
+edgeconnect/celeba,19UyiBlj4t2DlfCbhqRlkX3xdiUdzrZLG,42,EdgeModel_gen.pth,10851c18fe7aa9e9322ed1774a0cd233
+edgeconnect/celeba,1ofvNuHiY_jKg8-LVDE7CIVdWMk3ZXCRL,10.8,InpaintingModel_dis.pth,2f886c89399a29fac357a5c87c671d17
+edgeconnect/celeba,1ZrVNGUO1bP84PfQBTP-VARZmGl4rarou,42,InpaintingModel_gen.pth,8e898b12fd9b86dee56887123ff72fb5
+edgeconnect/psv,1lNjsFK0x4WXCFYF64Ns3KB_Flc2PuUcl,10.8,EdgeModel_dis.pth,ea6c734b66eeb8aed48e532f089957ec
+edgeconnect/psv,1shppHfINx_r9Xr1uUodLt0MyHRh60tZQ,42,EdgeModel_gen.pth,40c83e91ace061acd2bd95421750ffaf
+edgeconnect/psv,16pEDKygTnHXqxjoV3xN-3Ewy93qZ_kLg,10.8,InpaintingModel_dis.pth,bf9bb863592605237e620b8d73db225e
+edgeconnect/psv,1LrY_vplAiGcfX0B9c_m9HJsbfuvjITa2,42,InpaintingModel_gen.pth,afc0ce9b90413298972a2ef1fc65a3c7

install.bat

@@ -12,16 +12,23 @@ BATCH
 echo '**** GIMP-ML Setup started ****'
 if python --version 2>&1 | grep -q '^Python 3\.'; then #
     echo 'Python 3 found.' #
+    python -m pip install virtualenv
+    python -m virtualenv gimpenv3 #
+    source gimpenv3/bin/activate #
+    python -m pip3 install torch torchvision -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html #
+    python -m pip install GIMP-ML/.
+    python -c "import gimpml; gimpml.setup_python_weights()" #
+    deactivate #
+elif python3 --version 2>&1 | grep -q '^Python 3\.'; then #
+    echo 'Python 3 found.' #
+    python3 -m pip install virtualenv
+    python3 -m virtualenv gimpenv3 #
+    source gimpenv3/bin/activate #
+    python3 -m pip3 install torch torchvision -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html #
+    python3 -m pip install GIMP-ML/.
+    python3 -c "import gimpml; gimpml.setup_python_weights()" #
+    deactivate #
 else #
-    if python3 --version 2>&1 | grep -q '^Python 3\.'; then #
-        echo 'Python 3 found.' #
-        alias python='python3' #
-    fi #
+    echo 'Python 3 NOT found' #
 fi #
-python -m pip install virtualenv
-python -m virtualenv gimpenv3 #
-source gimpenv3/bin/activate #
-python -m pip install GIMP-ML/.
-python -c "import gimpml; gimpml.setup_python_weights()"
-deactivate #
 echo '*** GIMP-ML Setup Ended ****'

setup.py

@@ -70,7 +70,7 @@ setup(
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=['numpy', 'future; python_version <= "2.7"',
                       'scipy', 'gdown', 'typing', 'enum; python_version <= "2.7"', 'requests', 'opencv-python<=4.3',
-                      'pretrainedmodels', "torch", "torchvision"],
+                      'pretrainedmodels']#, "torch==1.8", "torchvision"],
 
 
     # Optional