omniopt2 8346__tar.gz → 8359__tar.gz

{omniopt2-8346 → omniopt2-8359}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 8346
+Version: 8359
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-8346 → omniopt2-8359}/omniopt

@@ -52,7 +52,7 @@
 		set -e
 	fi
 
-	source $SCRIPT_DIR/.colorfunctions.sh
+	source "$SCRIPT_DIR/.colorfunctions.sh"
 
 	cancelled_manually=0
 
@@ -390,7 +390,7 @@
 						if [[ -z $run_folder ]]; then
 							true
 						else
-							bash $SCRIPT_DIR/omniopt_share --username="$USER" "$run_folder" 2>/dev/null >/dev/null
+							bash "$SCRIPT_DIR/omniopt_share" --username="$USER" "$run_folder" 2>/dev/null >/dev/null
 						fi
 						set -e
 					else
@@ -404,7 +404,7 @@
 	}
 
 	function get_anon_user_id {
-		user_groups=$(echo "$(echo $USER | sha512sum)|groups=$(groups | tr ' ' '\n' | sort | sha512sum)")
+		user_groups=$(echo "$(echo "$USER" | sha512sum)|groups=$(groups | tr ' ' '\n' | sort | sha512sum)")
 		fixed_iv=$(echo -n "$user_groups" | sha512sum | cut -c1-32)
 		encrypted=$(echo -n "$user_groups" | openssl enc -aes-256-cbc -a -pass pass:"$(echo "$(groups | tr ' ' '\n' | sort | sha512sum)-$USER" | sha512sum | rev | sha512sum)" -iv "$fixed_iv" -nosalt -pbkdf2)
 		echo "$encrypted" | sha512sum | rev | sha512sum | rev | sha512sum | sha512sum | sed -e 's#[[:space:]].*##' | cut -c1-32
@@ -601,7 +601,7 @@
 
 				echo ""
 				caller
-				echo "Runtime (calltracer): $(displaytime $SECONDS), PID: $$"
+				echo "Runtime (calltracer): $(displaytime "$SECONDS"), PID: $$"
 			else
 				echo ""
 			fi
@@ -620,7 +620,7 @@
 				if [[ $python_pid =~ $re ]] ; then
 					if [[ -z "$already_sent_signal" ]]; then
 						if command -v ps 2>/dev/null >/dev/null; then
-							if ps auxf | grep $python_pid 2>/dev/null >/dev/null; then
+							if ps auxf | grep "$python_pid" 2>/dev/null >/dev/null; then
 								already_sent_signal=1
 								echo -e "\nSending USR1 to $python_pid (python). Reason: $REASON"
 								kill -USR1 "$python_pid"
@@ -633,7 +633,7 @@
 			fi
 
 			if [[ $kill_python_if_started_already_shown -eq 0 ]]; then
-				echo "Runtime (kill_python_if_started): $(displaytime $SECONDS), PID: $$"
+				echo "Runtime (kill_python_if_started): $(displaytime "$SECONDS"), PID: $$"
 				kill_python_if_started_already_shown=1
 			fi
 
@@ -678,7 +678,7 @@
 
 				printf "%02d:%02d:%02d\n" "$hours" "$minutes" "$seconds"
 			elif [[ $var =~ $time_re ]]; then
-				echo $var
+				echo "$var"
 			else
 				red_text "ERROR: $var is not a valid input. Must be a number of minutes (digits) or HH:MM:SS\n"
 
@@ -1183,7 +1183,7 @@ EOF
 					if [[ "$commits_since_tag" -gt 0 ]]; then
 						if [[ "$checkout_to_latest_tested_version" -eq "1" ]]; then
 							yellow_text "--checkout_to_latest_tested_version enabled. Checking out to $tag_commit_hash..."
-							git -C "$SCRIPT_DIR" checkout $tag_commit_hash >/dev/null 2>/dev/null || {
+							git -C "$SCRIPT_DIR" checkout "$tag_commit_hash" >/dev/null 2>/dev/null || {
 								red_text "\nFailed to checkout to latest version. Try not using --checkout_to_latest_tested_version.\n"
 								myexit 211
 							}
@@ -1627,7 +1627,7 @@ EOF
 			else
 				echo "Starting OmniOpt with Py-Spy"
 				pip install py-spy
-				stdbuf -e 0 -o 0 py-spy record --rate 10 --subprocesses --native --output $RUN_UUID.svg python3 -- "$SCRIPT_DIR/.omniopt.py" $args_string
+				stdbuf -e 0 -o 0 py-spy record --rate 10 --subprocesses --native --output "$RUN_UUID.svg" python3 -- "$SCRIPT_DIR/.omniopt.py" $args_string
 				EXIT_CODE=$?
 			fi
 		else
@@ -1888,7 +1888,8 @@ EOF
 
 
 						exit_code_lines=$(grep -i "exit-code:*" "$LOG_PATH" 2>/dev/null)
-						if [ $? -ne 0 ] || [ -z "$exit_code_lines" ]; then
+						exit_code_lines_lines=$?
+						if [ $exit_code_lines_lines -ne 0 ] || [ -z "$exit_code_lines" ]; then
 							echo "WARN: grep failed or no exit-code line found."
 							exit_code_lines=""
 						fi
@@ -1982,7 +1983,7 @@ EOF
 	fi
 
 	if [[ $show_runtime -eq 0 ]]; then
-		echo "Runtime (end): $(displaytime $SECONDS), PID: $$"
+		echo "Runtime (end): $(displaytime "$SECONDS"), PID: $$"
 	fi
 
 	if [[ -n $RUN_WITH_COVERAGE ]]; then

{omniopt2-8346 → omniopt2-8359}/omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 8346
+Version: 8359
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-8346 → omniopt2-8359}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {email = "norman.koch@tu-dresden.de"},
   {name = "Norman Koch"}
 ]
-version = "8346"
+version = "8359"
 
 readme = "README.md"
 dynamic = ["dependencies"]