diff --git a/caiman/run_caiman_cli.sh b/caiman/run_caiman_cli.sh index 6522742..438d4ec 100755 --- a/caiman/run_caiman_cli.sh +++ b/caiman/run_caiman_cli.sh @@ -39,12 +39,14 @@ export CAIMAN_DATA="/home/ubuntu/caiman_data" export MKL_NUM_THREADS=1 export OPENBLAS_NUM_THREADS=1 CAIMAN_DATA="$userhome/caiman_data" -python "$neurocaasrootdir"/caiman/parse_config_caiman.py "$bucketname" "$configpath" "$userhome/$configstore" +python "$neurocaasrootdir"/caiman/parse_config_caiman.py "$bucketname" "$userhome/$configstore/$configname" "$userhome/$configstore" echo "----PARAMETERS PARSED. STARTING ANALYSIS----" -python "$neurocaasrootdir"/caiman/process_caiman.py "$configstore/final_pickled_new" "$datapath" "$userhome/$outstore" "$configpath" +python "$neurocaasrootdir"/caiman/process_caiman.py "$userhome/$configstore/final_pickled_new" "$datapath" "$userhome/$outstore" "$userhome/$configstore/$configname" echo "----ANALYSIS FINISHED. GENERATING VIDEO----" python "$neurocaasrootdir/caiman/make_videos.py" --dirpath "$userhome/$outstore" --dataname "$dataname" ############################################################################################### ## Stereotyped upload script for the data echo "----UPLOADING RESULTS----" -neurocaas-contrib workflow put-result -r "$userhome/$outstore" + +resultpath=$(dirname $(neurocaas-contrib workflow get-resultpath -l "$userhome/check_vars.txt")) +aws s3 sync "$userhome/$outstore" $resultpath diff --git a/run_main_cli.sh b/run_main_cli.sh index 3929af7..d843d55 100755 --- a/run_main_cli.sh +++ b/run_main_cli.sh @@ -3,7 +3,7 @@ source "/home/ubuntu/.dlamirc" export PATH="/home/ubuntu/anaconda3/bin:$PATH" source activate caiman -neurocaas-contrib workflow initialize-job -p /home/ubuntu/contribdata +neurocaas-contrib workflow initialize-job -p /home/ubuntu/ncapdata neurocaas-contrib workflow register-dataset -b "$1" -k "$2" neurocaas-contrib workflow register-config -b "$1" -k "$4" diff --git a/src/setup.py b/src/setup.py index 7d9f0d1..e18fe36 100644 --- a/src/setup.py +++ b/src/setup.py @@ -21,7 +21,7 @@ classifiers=[ "Programming Language :: Python :: 3", ], - python_requires='>=3.6.8', + python_requires='>=3.6.6', include_package_data=True, package_data={"":["*Dockerfile","*.json","*.txt"]} )