Switch back to the main PRPLL repository.

Author: tdulcet

README.md

@@ -40,7 +40,7 @@ wget -qO - https://raw.github.com/tdulcet/Distributed-Computing-Scripts/master/m
 
 ### PRPLL
 
-Downloads, builds, sets up and runs [PRPLL-NTT](https://github.com/gwoltman/gpuowl). PRPLL is the successor of GpuOwl and should be much faster. Downloads, sets up and runs [AutoPrimeNet](https://github.com/tdulcet/AutoPrimeNet) for automated PrimeNet assignments. Supports Nvidia, AMD and Intel GPUs supporting OpenCL. Note that PRPLL uses C++20 and thus requires at least the GNU C++ compiler 8. Run: `g++ --version` to output your version.
+Downloads, builds, sets up and runs [PRPLL NTT](https://github.com/preda/gpuowl). PRPLL is the successor of GpuOwl and should be much faster. Downloads, sets up and runs [AutoPrimeNet](https://github.com/tdulcet/AutoPrimeNet) for automated PrimeNet assignments. Supports Nvidia, AMD and Intel GPUs supporting OpenCL. Note that PRPLL uses C++20 and thus requires at least the GNU C++ compiler 8. Run: `g++ --version` to output your version.
 
 ```
 wget -qO - https://raw.github.com/tdulcet/Distributed-Computing-Scripts/master/prpll.sh | bash -s -- [PrimeNet User ID] [Computer name] [Type of work] [Idle time to run (mins)]
@@ -107,7 +107,7 @@ This script can be used with any [project that uses BOINC](https://boinc.berkele
 Downloads, installs and sets up [Folding@home](https://foldingathome.org/start-folding/).
 
 ```
-wget -qO - https://raw.github.com/tdulcet/Distributed-Computing-Scripts/master/folding.sh | bash -s -- [Username] [Team number] [Passkey] [Power]
+wget -qO - https://raw.github.com/tdulcet/Distributed-Computing-Scripts/master/folding.sh | bash -s -- [Username] [Team number] [Passkey] [Power] [Account Token]
 ```
 
 These scripts should work on Ubuntu, Debian and any Linux distribution that can use the apt package manager.

google-colab/README.md

@@ -1,7 +1,7 @@
 # Google Colaboratory and GIMPS
 Google offers a service known as [Colaboratory](https://research.google.com/colaboratory/faq.html) (Colab), which allows anyone with an internet connection free access to high-performance TPU, GPU and CPU-powered [Jupyter Notebooks](https://en.wikipedia.org/wiki/Project_Jupyter#Jupyter_Notebook).
 This service can be used to run Distributed Computing projects such as the [Great Internet Mersenne Prime Search](https://www.mersenne.org/) (GIMPS) for free.
-GIMPS can be run on some Nvidia, AMD and Intel GPUs using the [PRPLL](https://github.com/gwoltman/gpuowl) program or a CPU using the [Prime95/MPrime](https://www.mersenne.org/download/) program.
+GIMPS can be run on some Nvidia, AMD and Intel GPUs using the [PRPLL](https://github.com/preda/gpuowl) program or a CPU using the [Prime95/MPrime](https://www.mersenne.org/download/) program.
 
 This repository contains two Jupyter Notebooks, a “CPU” only notebook (`Colab CPU MPrime.ipynb`) and a “GPU and CPU” notebook (`Colab GPU PRPLL.ipynb`). The “CPU” only notebook runs MPrime, while the “GPU and CPU” notebook runs both PRPLL and MPrime since they can run simultaneously to “crunch” more prime numbers. Previous versions of the GPU notebook ran GpuOwl and CUDALucas.
 Each notebook makes use of Google Drive storage, which is provided to all Google accounts. See here for a [“TPU” only notebook](https://github.com/TPU-Mersenne-Prime-Search/TensorPrime/wiki/Usage-and-Arguments) which runs TensorPrime.

prpll.sh

@@ -91,26 +91,24 @@ fi
 TIME=$(echo "$TIME" | awk '{ printf "%g", $1 * 60 }')
 if command -v git >/dev/null; then
 	echo -e "Downloading PRPLL\n"
-	git clone https://github.com/gwoltman/gpuowl.git "$DIR"
+	git clone https://github.com/preda/gpuowl.git "$DIR"
 	cd "$DIR"
-	git remote add upstream https://github.com/preda/gpuowl.git
-	git fetch upstream
 	sed -i 's/--dirty //' Makefile
 	sed -i 's/ --match v\/prpll\/\*//' Makefile
 else
 	echo -e "Downloading PRPLL\n"
-	wget https://github.com/gwoltman/gpuowl/archive/$BRANCH.tar.gz
+	wget https://github.com/preda/gpuowl/archive/$BRANCH.tar.gz
 	echo -e "\nDecompressing the files\n"
 	tar -xzvf $BRANCH.tar.gz
 	mv -v gpuowl-$BRANCH/ "$DIR"/
 	cd "$DIR"
-	if output=$(curl -sf 'https://api.github.com/repos/gwoltman/gpuowl/tags?per_page=1'); then
+	if output=$(curl -sf 'https://api.github.com/repos/preda/gpuowl/tags?per_page=1'); then
 		if command -v jq >/dev/null; then
 			name=$(echo "$output" | jq -r '.[0].name')
 		else
 			name=$(echo "$output" | python3 -c 'import sys, json; print(json.load(sys.stdin)[0]["name"])')
 		fi
-		if output=$(curl -sf "https://api.github.com/repos/gwoltman/gpuowl/compare/$BRANCH...$name"); then
+		if output=$(curl -sf "https://api.github.com/repos/preda/gpuowl/compare/$BRANCH...$name"); then
 			if command -v jq >/dev/null; then
 				behind_by=$(echo "$output" | jq '.behind_by')
 				sha=$(echo "$output" | jq -r '.base_commit.sha')

prpll2.sh

@@ -97,26 +97,24 @@ if [[ -d $DIR && -x "$DIR/prpll" ]]; then
 else
 	if command -v git >/dev/null; then
 		echo -e "Downloading PRPLL\n"
-		git clone https://github.com/gwoltman/gpuowl.git "$DIR"
+		git clone https://github.com/preda/gpuowl.git "$DIR"
 		cd "$DIR"
-		git remote add upstream https://github.com/preda/gpuowl.git
-		git fetch upstream
 		sed -i 's/--dirty //' Makefile
 		sed -i 's/ --match v\/prpll\/\*//' Makefile
 	else
 		echo -e "Downloading PRPLL\n"
-		wget https://github.com/gwoltman/gpuowl/archive/$BRANCH.tar.gz
+		wget https://github.com/preda/gpuowl/archive/$BRANCH.tar.gz
 		echo -e "\nDecompressing the files\n"
 		tar -xzvf $BRANCH.tar.gz
 		mv -v gpuowl-$BRANCH/ "$DIR"/
 		cd "$DIR"
-		if output=$(curl -sf 'https://api.github.com/repos/gwoltman/gpuowl/tags?per_page=1'); then
+		if output=$(curl -sf 'https://api.github.com/repos/preda/gpuowl/tags?per_page=1'); then
 			if command -v jq >/dev/null; then
 				name=$(echo "$output" | jq -r '.[0].name')
 			else
 				name=$(echo "$output" | python3 -c 'import sys, json; print(json.load(sys.stdin)[0]["name"])')
 			fi
-			if output=$(curl -sf "https://api.github.com/repos/gwoltman/gpuowl/compare/$BRANCH...$name"); then
+			if output=$(curl -sf "https://api.github.com/repos/preda/gpuowl/compare/$BRANCH...$name"); then
 				if command -v jq >/dev/null; then
 					behind_by=$(echo "$output" | jq '.behind_by')
 					sha=$(echo "$output" | jq -r '.base_commit.sha')