From 6c361530d02d431a0dfe1b6d0340d0e81bc96291 Mon Sep 17 00:00:00 2001 From: Gary Bey Date: Tue, 20 Sep 2022 16:21:41 +0800 Subject: [PATCH] :hammer: Fix for cardboardcode/easy_perception_deployment#15. (#59) Signed-off-by: Bey Hao Yun --- easy_perception_deployment/CHANGELOG.rst | 5 +++++ .../gui/trainer/training_files/scripts/copy_op.bash | 2 ++ .../trainer/training_files/scripts/copy_training_files.bash | 4 ++++ .../scripts/prepare_trainfarm_docker_container.bash | 3 --- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/easy_perception_deployment/CHANGELOG.rst b/easy_perception_deployment/CHANGELOG.rst index 299e1aa..10e0ee1 100644 --- a/easy_perception_deployment/CHANGELOG.rst +++ b/easy_perception_deployment/CHANGELOG.rst @@ -86,3 +86,8 @@ Changelog for package easy_perception_deployment ------------------- * Included FORCE_CUDA variable when creating P2 and P3 training & exporting docker containers. Verified with fresh install. * Contributor(s): Bey Hao Yun + +0.3.3 (2022-09-14) +------------------- +* Fix for [#15](https://github.com/cardboardcode/easy_perception_deployment/issues/15). +* Contributor(s): Bey Hao Yun \ No newline at end of file diff --git a/easy_perception_deployment/gui/trainer/training_files/scripts/copy_op.bash b/easy_perception_deployment/gui/trainer/training_files/scripts/copy_op.bash index f337d0b..b475f55 100755 --- a/easy_perception_deployment/gui/trainer/training_files/scripts/copy_op.bash +++ b/easy_perception_deployment/gui/trainer/training_files/scripts/copy_op.bash @@ -41,9 +41,11 @@ if [ ! -d "/home/user/trainer/training_files/custom_dataset" ] ; then echo "[ERROR] - [ custom_dataset ] NOT FOUND..." else if $TRAIN_MASKRCNN ; then + rm -r /home/user/p3_trainer/datasets/custom_dataset echo "[ custom_dataset ] FOUND. Transferring to p3_trainer/datasets/custom_dataset" cp --force -r /home/user/trainer/training_files/custom_dataset /home/user/p3_trainer/datasets/custom_dataset else + rm -r /home/user/p2_trainer/datasets/custom_dataset echo "[ custom_dataset ] FOUND. Transferring to p2_trainer/datasets/custom_dataset" cp --force -r /home/user/trainer/training_files/custom_dataset /home/user/p2_trainer/datasets/custom_dataset fi diff --git a/easy_perception_deployment/gui/trainer/training_files/scripts/copy_training_files.bash b/easy_perception_deployment/gui/trainer/training_files/scripts/copy_training_files.bash index b95f667..3f192bc 100755 --- a/easy_perception_deployment/gui/trainer/training_files/scripts/copy_training_files.bash +++ b/easy_perception_deployment/gui/trainer/training_files/scripts/copy_training_files.bash @@ -20,6 +20,10 @@ TRAIN_MASKRCNN=$1 +# Copy over custom_dataset to training_files/ +sudo rm -r trainer/training_files/custom_dataset +cp -r ../data/datasets/custom_dataset trainer/training_files/ + copy_script="./home/user/trainer/training_files/scripts/copy_op.bash" if $TRAIN_MASKRCNN ; then diff --git a/easy_perception_deployment/gui/trainer/training_files/scripts/prepare_trainfarm_docker_container.bash b/easy_perception_deployment/gui/trainer/training_files/scripts/prepare_trainfarm_docker_container.bash index 24b81c8..429409d 100644 --- a/easy_perception_deployment/gui/trainer/training_files/scripts/prepare_trainfarm_docker_container.bash +++ b/easy_perception_deployment/gui/trainer/training_files/scripts/prepare_trainfarm_docker_container.bash @@ -20,9 +20,6 @@ TRAIN_MASKRCNN=$1 -# Copy over custom_dataset to training_files/ -cp -r ../data/datasets/custom_dataset trainer/training_files/ - install_script="./home/user/trainer/training_files/scripts/install_op.bash" if $TRAIN_MASKRCNN ; then