From 1c91ffbf6ed35b3cc638a0ec4048c8ed0560d074 Mon Sep 17 00:00:00 2001
From: Bing Gong <b.gong@fz-juelich.de>
Date: Fri, 19 Jun 2020 09:15:51 +0200
Subject: [PATCH] create folder external_package and mv hickle and
lpips-tensorflow package there
---
.../env_setup/create_env_zam347.sh | 14 +++-----------
.../lpips-tensorflow/.gitignore | 0
.../lpips-tensorflow/.gitmodules | 0
.../lpips-tensorflow/LICENSE | 0
.../lpips-tensorflow/README.md | 0
.../lpips-tensorflow/export_to_tensorflow.py | 0
.../lpips-tensorflow/lpips_tf.py | 0
.../lpips-tensorflow/requirements-dev.txt | 0
.../lpips-tensorflow/requirements.txt | 0
.../lpips-tensorflow/setup.py | 0
.../lpips-tensorflow/test_network.py | 0
11 files changed, 3 insertions(+), 11 deletions(-)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/.gitignore (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/.gitmodules (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/LICENSE (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/README.md (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/export_to_tensorflow.py (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/lpips_tf.py (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/requirements-dev.txt (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/requirements.txt (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/setup.py (100%)
rename video_prediction_savp/{ => external_package}/lpips-tensorflow/test_network.py (100%)
diff --git a/video_prediction_savp/env_setup/create_env_zam347.sh b/video_prediction_savp/env_setup/create_env_zam347.sh
index 5e0c43c5..711810a1 100755
--- a/video_prediction_savp/env_setup/create_env_zam347.sh
+++ b/video_prediction_savp/env_setup/create_env_zam347.sh
@@ -7,34 +7,26 @@ if [[ ! -n "$1" ]]; then
fi
ENV_NAME=$1
-WORKING_DIR=/home/$USER/video_prediction_savp
+WORKING_DIR=/home/$USER/ambs/video_prediction_savp
ENV_SETUP_DIR=${WORKING_DIR}/env_setup
ENV_DIR=${WORKING_DIR}/${ENV_NAME}
unset PYTHONPATH
-#source ${ENV_SETUP_DIR}/modules.sh
# Install additional Python packages.
python3 -m venv $ENV_DIR
source ${ENV_DIR}/bin/activate
pip3 install --upgrade pip
pip3 install -r ${ENV_SETUP_DIR}/requirements.txt
-#conda install mpi4py
pip3 install mpi4py
pip3 install netCDF4
pip3 install numpy
pip3 install h5py
pip3 install tensorflow-gpu==1.13.1
-#Copy the hickle package from bing's account
-#cp -r /p/project/deepacf/deeprain/bing/hickle ${WORKING_DIR}
-cp -r /home/b.gong/video_prediction_savp/hickle ${WORKING_DIR}
-
-#source ${ENV_SETUP_DIR}/modules.sh
-#source ${ENV_DIR}/bin/activate
#export PYTHONPATH=/home/$USER/miniconda3/pkgs:$PYTHONPATH
-export PYTHONPATH=${WORKING_DIR}/hickle/lib/python3.6/site-packages:$PYTHONPATH
+export PYTHONPATH=${WORKING_DIR}/external_package/hickle/lib/python3.6/site-packages:$PYTHONPATH
export PYTHONPATH=${WORKING_DIR}:$PYTHONPATH
#export PYTHONPATH=${ENV_DIR}/lib/python3.6/site-packages:$PYTHONPATH
#export PYTHONPATH=/p/home/jusers/${USER}/juwels/.local/bin:$PYTHONPATH
-export PYTHONPATH=${WORKING_DIR}/lpips-tensorflow:$PYTHONPATH
+export PYTHONPATH=${WORKING_DIR}/external_package/lpips-tensorflow:$PYTHONPATH
diff --git a/video_prediction_savp/lpips-tensorflow/.gitignore b/video_prediction_savp/external_package/lpips-tensorflow/.gitignore
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/.gitignore
rename to video_prediction_savp/external_package/lpips-tensorflow/.gitignore
diff --git a/video_prediction_savp/lpips-tensorflow/.gitmodules b/video_prediction_savp/external_package/lpips-tensorflow/.gitmodules
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/.gitmodules
rename to video_prediction_savp/external_package/lpips-tensorflow/.gitmodules
diff --git a/video_prediction_savp/lpips-tensorflow/LICENSE b/video_prediction_savp/external_package/lpips-tensorflow/LICENSE
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/LICENSE
rename to video_prediction_savp/external_package/lpips-tensorflow/LICENSE
diff --git a/video_prediction_savp/lpips-tensorflow/README.md b/video_prediction_savp/external_package/lpips-tensorflow/README.md
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/README.md
rename to video_prediction_savp/external_package/lpips-tensorflow/README.md
diff --git a/video_prediction_savp/lpips-tensorflow/export_to_tensorflow.py b/video_prediction_savp/external_package/lpips-tensorflow/export_to_tensorflow.py
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/export_to_tensorflow.py
rename to video_prediction_savp/external_package/lpips-tensorflow/export_to_tensorflow.py
diff --git a/video_prediction_savp/lpips-tensorflow/lpips_tf.py b/video_prediction_savp/external_package/lpips-tensorflow/lpips_tf.py
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/lpips_tf.py
rename to video_prediction_savp/external_package/lpips-tensorflow/lpips_tf.py
diff --git a/video_prediction_savp/lpips-tensorflow/requirements-dev.txt b/video_prediction_savp/external_package/lpips-tensorflow/requirements-dev.txt
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/requirements-dev.txt
rename to video_prediction_savp/external_package/lpips-tensorflow/requirements-dev.txt
diff --git a/video_prediction_savp/lpips-tensorflow/requirements.txt b/video_prediction_savp/external_package/lpips-tensorflow/requirements.txt
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/requirements.txt
rename to video_prediction_savp/external_package/lpips-tensorflow/requirements.txt
diff --git a/video_prediction_savp/lpips-tensorflow/setup.py b/video_prediction_savp/external_package/lpips-tensorflow/setup.py
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/setup.py
rename to video_prediction_savp/external_package/lpips-tensorflow/setup.py
diff --git a/video_prediction_savp/lpips-tensorflow/test_network.py b/video_prediction_savp/external_package/lpips-tensorflow/test_network.py
similarity index 100%
rename from video_prediction_savp/lpips-tensorflow/test_network.py
rename to video_prediction_savp/external_package/lpips-tensorflow/test_network.py
--
GitLab