Improvements to ease packaging work on Linux #156
Conversation
|
I realized that part of the changes I made in |
|
Ok this is ready to be tested. I ended up reverting a few things since Friday and my most recent commit installs the plugins from the source repo rather than from the virtualenv, that way the plugin .py files retain their executable permission (they lose this permission when installed into the virtualenv) and we don't need to update the file permissions from |
install.sh
Outdated
| @@ -49,7 +49,7 @@ deactivate | |||
| echo "Installing plugin in $HOME/.config/GIMP/2.99/plug-ins" | |||
| for d in openvino_utils semseg_ov stable_diffusion_ov superresolution_ov; do | |||
| mkdir -p "$HOME/.config/GIMP/2.99/plug-ins/$d" | |||
| rsync -a gimpenv3/lib/python*/site-packages/gimpopenvino/plugins/"$d" "$HOME/.config/GIMP/2.99/plug-ins/." | |||
| rsync -a "$script_dir/gimpopenvino/plugins/$d" "$HOME/.config/GIMP/2.99/plug-ins/." | |||
There was a problem hiding this comment.
The issue with this line is that it will miss the gimp_openvino_config.json file copy to the default config_dir_path in the case that an Environment variable is not used.
The goal here is to copy from the $script_dir because of the executable permissions change needed?
There was a problem hiding this comment.
Ah yeah I missed that. Yes, the goal is to avoid running chmod +x on the plugin files from complete_install.py because the library is already installed at this point...so this causes some problems for a containerized packaging format like snaps use. It's not a major issue, just a nice-to-have.
I could just settle for wrapping the chmod's with a try-except. What do you think?
There was a problem hiding this comment.
if it is not a major issue, we can bin it for now and wrap the chmod commands with try-except. i think the real solution is to re-think how the config file gets created the first time.
There was a problem hiding this comment.
Ok I just reverted all the chmod -related changes for the plugins. I didn't even bother with a try-except because suprocess.call() does not throw an exception even if the shell command fails.
There was a problem hiding this comment.
Also let me know if you'd like me to clean up the commits. I often use the squash merge method from GitHub but if you prefer I clean up the commits locally just let me know. :)
* Set config and model paths dynamically from environment vars Signed-off-by: Will French <[email protected]> * Centralizing ENV VARs into tools_utils. * Fixing default path. * fixing test for python executable logic * Adding threading to SR to avoid not responding messages. * removing debug statement * Improvements to ease packaging work on Linux (#156) * Allow model_setup to be run from any directory * Store plugin scripts with executable permissions * Remove typing as it ships with stdlib since python 3.5 * Install plugin files with executable permissions preserved * Revert data_files addition to avoid complexity * Install plugins from source repo instead of venv * Revert permissions changes to test failure inside snap * Initial update of SR to GIMP 3.0. * Updating Save Image to work with GIMP 3.0 * Removing unneeded comments. * Initial update of Segmentation to GIMP 3.0 * Removing uneeded files. * Updating install path * Moving to latest OpenVINO - 2024.6.0 * removing unneeded log.info calls. * Updating proc id for GIMP 3.0 * Updating plugin version number * Initial update of SD to GIMP 3.0 * Updating option caching in SD. * removed files that are no longer used. * Implemented SDOptionCache to address issues with options being saved run-to-run. * Removed debug prints, unneeded syspath extention * remove commented syspath line * Adding version support for plugins. * updated install flow. removed need to call complete_install separately. * Hiding console for SR and SS. SD is still WIP * removed .json config, as it should be created from scratch everytime. * restored alignment of OV logo. * Updated NPU Arch logic to support next gen NPUs * Updated NPU Arch logic to support next gen NPUs * update ARCH_NEXT and tweak logic * Fixed NPU Arch logic to work correctly. * Add check for dNPU to avoid NPU turbo enabling exception for those devices * workaround for 3700 series being reported incorrectly in OV2024.5+ * restore running complete_install post setup * update tools_utils import * subprocess call is diff for Linux vs Windows * Removing import of install_utils. It relies on importing openvino, which was causing issues in Linux for some reason. For now, we are have the get_plugin_version code duplicated here. Need to find a way to remove it in the future. * Longer timeout needed for some systems. * Updating title bar to show just the plugin version. * updating process name to work with Linux * Adding linux support for BIOS discovery * Really fixing issue #158 this time. * Updating linux build docs * fixing issue with ENV var installation and commandline model installs. * Updating download links for GIMP3 RC2 * Updating figure for GIMP3 RC2 * Updating setup complete figure for GIMP3 RC2 * Updates for Docs and Figures for GIMP 3.0 --------- Signed-off-by: Garth Long <[email protected]> Signed-off-by: Will French <[email protected]> Co-authored-by: Will French <[email protected]> Co-authored-by: Ryan Metcalfe <[email protected]>
typingfromsetup.pyas this ships with the standard library since Python 3.5, and installing it as a separate package can cause conflicts on Ubuntumodel_setup.pyto allow this script to be run from anywheredata_filesinstalled atgimp-plugins/. Unfortunately without adding these todata_filesthe files do not retain their executable permissions. The absolute path to thegimp-plugins/file is system/environment-dependent. For example, in a virtualenv this directory will be in the root directory of the virtualenv. On Ubuntu 24.04 pip-installinggimpopenvinosystem-wide puts the directory at/usr/local/gimp-plugins.I tested these changes (by running some simple tests for each plugin) within a GIMP snap I have built locally running on Ubuntu 24.04, but I have NOT tested on Windows or even the
install.shscript on Linux.