From 0f59350b13573dcf16331468992da8eaf286005b Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Wed, 6 Nov 2024 16:44:05 -0500
Subject: [PATCH 01/16] adds chaining task per second

---
 test-vine-task-throughput.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index fb2f5df..dc13c3a 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -30,9 +30,23 @@
                 start_timer = False
     
     end = time.time()
-    e = end-start
-    print(f"It took {e} seconds\n")
-    print(f"Throughput was {num_tasks/e} tasks per second")
+    many = end - start
+
+    start = time.time()
+    with factory:
+        for i in range(num_tasks):
+            while not q.empty():
+                result = q.wait(5)
+            t = vine.Task(command=":")
+            task_id = q.submit(t)
+
+        print("waiting for tasks to complete...")
+    end = time.time()
+    one = end - start
+
+    print(f"It took {many} seconds\n")
+    print(f"Throughput was {num_tasks/many} tasks per second")
+    print(f"Chaining was {num_tasks/one} tasks per second")
     print("all tasks complete!")
     
 # vim: set sts=4 sw=4 ts=4 expandtab ft=python:

From a9974d2af9a9baaffe185c282227d14a7d356541 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Thu, 14 Nov 2024 14:19:00 -0500
Subject: [PATCH 02/16] adding throughput and chaining tests for c API and
 severless

---
 test-vine-task-chaining.c   | 52 ++++++++++++++++++++++++++++++++++++
 test-vine-task-severless.py | 51 +++++++++++++++++++++++++++++++++++
 test-vine-task-throughput.c | 53 +++++++++++++++++++++++++++++++++++++
 3 files changed, 156 insertions(+)
 create mode 100644 test-vine-task-chaining.c
 create mode 100755 test-vine-task-severless.py
 create mode 100644 test-vine-task-throughput.c

diff --git a/test-vine-task-chaining.c b/test-vine-task-chaining.c
new file mode 100644
index 0000000..8a1af1d
--- /dev/null
+++ b/test-vine-task-chaining.c
@@ -0,0 +1,52 @@
+#include "taskvine.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <time.h>
+
+int main(int argc, char *argv[])
+{
+	struct vine_manager *m;
+	int i;
+    int tasksC = 5000;
+
+	//Create the manager. All tasks and files will be declared with respect to
+	//this manager.
+	m = vine_create(VINE_DEFAULT_PORT);
+	if(!m) {
+		printf("couldn't create manager: %s\n", strerror(errno));
+		return 1;
+	}
+	printf("TaskVine listening on %d\n", vine_port(m));
+
+	printf("Declaring tasks...");
+	bool start_timer = true
+	for(i=0;i<tasksC;i++) {
+		struct vine_task *t = vine_task_create(":");
+		vine_task_set_cores(t, 1);
+
+		int task_id = vine_submit(m, t);
+        while(!vine_empty(m)) {
+			if (start_timer):
+				clock_t start = clock();
+            t  = vine_wait(m, 5);
+            if(t) {
+                vine_task_delete(t);
+            }
+        }
+	}
+	clock_t end = clock();
+	double time = ((double)(end - start)) / CLOCKS_PER_SEC;
+	double throughput = tasksC / time;
+	printf("all tasks complete!\n");
+	printf("Time was %f seconds\n", time);
+	printf("Throughput was %f tasks per second\n", throughput);
+
+	//Free the manager structure, and release all the workers.
+	vine_delete(m);
+
+	return 0;
+}
diff --git a/test-vine-task-severless.py b/test-vine-task-severless.py
new file mode 100755
index 0000000..606c6d9
--- /dev/null
+++ b/test-vine-task-severless.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+import ndcctools.taskvine as vine
+import time
+
+def func():
+    return 
+
+def main():
+    print("Creating TaskVine manager...")
+    q = vine.Manager()
+    num_tasks = 1000
+    print("Creating Library from functions...")
+    function_lib = q.create_library_from_functions('test-library', func, add_env=False)
+    q.install_library(function_lib)
+
+    print("Starting worker factory for port {}...".format(q.port))
+    factory = vine.Factory("local",manager_host_port="localhost:{}".format(q.port))
+    factory.max_workers=1
+    factory.min_workers=1
+    
+    with factory:
+        print("Submitting tasks...")
+        for i in range (num_tasks):
+            t = vine.FunctionCall('test-library', 'func')
+            task_id = q.submit(t)
+
+        print("Waiting for tasks to complete...")
+        start_timer = True
+        while not q.empty():
+            t = q.wait(5)
+            if start_timer:
+                start = time.time()
+                start_timer = False
+        end = time.time()
+        many = end - start
+
+        start = time.time()
+        for i in range(num_tasks):
+            while not q.empty():
+                result = q.wait(5)
+            t = vine.FunctionCall('test-library', 'func')
+            task_id = q.submit(t)
+        end = time.time()
+        one = end-start
+    print(f"It took {many} seconds\n")
+    print(f"Throughput was {num_tasks/many} tasks per second")
+    print(f"Chaining was {num_tasks/one} tasks per second")
+    print("all tasks complete!")
+
+if __name__ == '__main__':
+    main()
diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
new file mode 100644
index 0000000..d5c6472
--- /dev/null
+++ b/test-vine-task-throughput.c
@@ -0,0 +1,53 @@
+#include "taskvine.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <time.h>
+
+int main(int argc, char *argv[])
+{
+	struct vine_manager *m;
+	struct vine_task *t;
+	int i;
+    int tasksC = 5000;
+
+	//Create the manager. All tasks and files will be declared with respect to
+	m = vine_create(VINE_DEFAULT_PORT);
+	if(!m) {
+		printf("couldn't create manager: %s\n", strerror(errno));
+		return 1;
+	}
+	printf("TaskVine listening on %d\n", vine_port(m));
+	printf("Declaring tasks...");
+
+	for(i=0;i<tasksC;i++) {
+		struct vine_task *t = vine_task_create(":");
+		vine_task_set_cores(t, 1);
+		int task_id = vine_submit(m, t);
+	}
+
+	printf("waiting for tasks to complete...\n");
+	bool start_timer = true;
+	while(!vine_empty(m)) {
+		t  = vine_wait(m, 5);
+		if (start_timer):
+			clock_t start = clock();
+			start = false
+		if(t) {
+			vine_task_delete(t);
+		}
+	}
+	clock_t end = clock();
+	double time = ((double)(end - start)) / CLOCKS_PER_SEC;
+	double throughput = tasksC / time;
+	printf("all tasks complete!\n");
+	printf("Time was %f seconds\n", time);
+	printf("Throughput was %f tasks per second\n", throughput);
+	//Free the manager structure, and release all the workers.
+	vine_delete(m);
+
+	return 0;
+}

From 929d09a6b50cdbd6ae0215f05c768d32099dd5ab Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Thu, 14 Nov 2024 14:23:56 -0500
Subject: [PATCH 03/16] Edit yml file

---
 .github/workflows/daily.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 8824256..6963259 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -96,6 +96,14 @@ jobs:
         - name: Test TopEFT + Work Queue
           run:  ./test-topeft.sh
 
+  vine-task-throughput:
+     runs-on: ubuntu-20.04
+     timeout-minutes: 20
+     steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Test Vine Throughput
+          run:  ./test-vine-task-throughput.sh
 # Removed plain coffea test 7/24/2023 to replace with coffea-dask-taskvine when ready.
 #  coffea-job:
 #    runs-on: ubuntu-20.04

From a5a3911169660ca43dc4a75a5d66214fcdf0900e Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Thu, 14 Nov 2024 14:59:11 -0500
Subject: [PATCH 04/16] adds severless script to sh file

---
 test-vine-task-chaining.c    | 6 ++----
 test-vine-task-throughput.c  | 5 +----
 test-vine-task-throughput.sh | 6 +++++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test-vine-task-chaining.c b/test-vine-task-chaining.c
index 8a1af1d..bc949ba 100644
--- a/test-vine-task-chaining.c
+++ b/test-vine-task-chaining.c
@@ -23,15 +23,13 @@ int main(int argc, char *argv[])
 	printf("TaskVine listening on %d\n", vine_port(m));
 
 	printf("Declaring tasks...");
-	bool start_timer = true
+
 	for(i=0;i<tasksC;i++) {
 		struct vine_task *t = vine_task_create(":");
 		vine_task_set_cores(t, 1);
-
+		clock_t start = clock();
 		int task_id = vine_submit(m, t);
         while(!vine_empty(m)) {
-			if (start_timer):
-				clock_t start = clock();
             t  = vine_wait(m, 5);
             if(t) {
                 vine_task_delete(t);
diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
index d5c6472..3f49e30 100644
--- a/test-vine-task-throughput.c
+++ b/test-vine-task-throughput.c
@@ -30,12 +30,9 @@ int main(int argc, char *argv[])
 	}
 
 	printf("waiting for tasks to complete...\n");
-	bool start_timer = true;
+	clock_t start = clock();
 	while(!vine_empty(m)) {
 		t  = vine_wait(m, 5);
-		if (start_timer):
-			clock_t start = clock();
-			start = false
 		if(t) {
 			vine_task_delete(t);
 		}
diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index f26cc10..914aefd 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -4,7 +4,11 @@
 . ./install-conda-devel.sh
 
 # Install conda development environment
-. ./install-github.sh
+source ./install-github.sh
+
+conda create -yq --prefix ${CONDA_ENV} -c conda-forge --strict-channel-priority ndcctools dask
+conda activate ${CONDA_ENV}
 
 # Run the serverless test case.
 python3 test-vine-task-throughput.py
+python3 test-vine-task-serverless.py
\ No newline at end of file

From 5cd6fd1d4bf9597e0fc747b30a683318771a01bd Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 16:59:16 -0500
Subject: [PATCH 05/16] fixes errors and adds assert to pass or fail

---
 .github/workflows/daily.yml  | 11 ++++++++++-
 test-vine-task-chaining.c    | 17 ++++++++++-------
 test-vine-task-severless.py  | 10 +++++++---
 test-vine-task-throughput.c  | 36 ++++++++++++++++++++----------------
 test-vine-task-throughput.py | 10 ++++++----
 test-vine-task-throughput.sh |  2 +-
 6 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 6963259..9763745 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -77,7 +77,7 @@ jobs:
           uses: actions/checkout@v3
         - name: Test Vine Serverless Mode
           run:  ./test-vine-serverless.sh
-  
+
   parrot-cvmfs-job:
     runs-on: ubuntu-20.04
     timeout-minutes: 10
@@ -104,6 +104,15 @@ jobs:
           uses: actions/checkout@v3
         - name: Test Vine Throughput
           run:  ./test-vine-task-throughput.sh
+          
+  vine-throughput-capi-job:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 20
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Test Vine Throughput Test C API
+        run:  ./test-vine-task-throughput-capi.sh
 # Removed plain coffea test 7/24/2023 to replace with coffea-dask-taskvine when ready.
 #  coffea-job:
 #    runs-on: ubuntu-20.04
diff --git a/test-vine-task-chaining.c b/test-vine-task-chaining.c
index bc949ba..348a908 100644
--- a/test-vine-task-chaining.c
+++ b/test-vine-task-chaining.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-
+#include <assert.h>
 int main(int argc, char *argv[])
 {
 	struct vine_manager *m;
@@ -23,11 +23,15 @@ int main(int argc, char *argv[])
 	printf("TaskVine listening on %d\n", vine_port(m));
 
 	printf("Declaring tasks...");
-
+	bool start_timer = true;
+	clock_t start = 0;
 	for(i=0;i<tasksC;i++) {
 		struct vine_task *t = vine_task_create(":");
 		vine_task_set_cores(t, 1);
-		clock_t start = clock();
+		if (start_timer){
+			start = clock();
+			start_timer = false;
+		}
 		int task_id = vine_submit(m, t);
         while(!vine_empty(m)) {
             t  = vine_wait(m, 5);
@@ -39,11 +43,10 @@ int main(int argc, char *argv[])
 	clock_t end = clock();
 	double time = ((double)(end - start)) / CLOCKS_PER_SEC;
 	double throughput = tasksC / time;
-	printf("all tasks complete!\n");
-	printf("Time was %f seconds\n", time);
-	printf("Throughput was %f tasks per second\n", throughput);
 
-	//Free the manager structure, and release all the workers.
+	printf("Throughput was %f tasks per second\n", throughput);
+	printf("all tasks complete!\n");
+	assert(throughput > 1000);
 	vine_delete(m);
 
 	return 0;
diff --git a/test-vine-task-severless.py b/test-vine-task-severless.py
index 606c6d9..8a95d07 100755
--- a/test-vine-task-severless.py
+++ b/test-vine-task-severless.py
@@ -42,10 +42,14 @@ def main():
             task_id = q.submit(t)
         end = time.time()
         one = end-start
-    print(f"It took {many} seconds\n")
-    print(f"Throughput was {num_tasks/many} tasks per second")
-    print(f"Chaining was {num_tasks/one} tasks per second")
+    throughput = num_tasks/many
+    chaining = num_tasks/one
+
+    print(f"Throughput was {throughput} tasks per second")
+    print(f"Chaining was {chaining} tasks per second")
     print("all tasks complete!")
+    assert throughput >= 110
+    assert chaining >= 50
 
 if __name__ == '__main__':
     main()
diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
index 3f49e30..9744654 100644
--- a/test-vine-task-throughput.c
+++ b/test-vine-task-throughput.c
@@ -6,44 +6,48 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-
+#include <assert.h>
 int main(int argc, char *argv[])
 {
 	struct vine_manager *m;
-	struct vine_task *t;
 	int i;
     int tasksC = 5000;
 
-	//Create the manager. All tasks and files will be declared with respect to
 	m = vine_create(VINE_DEFAULT_PORT);
+	printf("%d", VINE_DEFAULT_PORT);
 	if(!m) {
 		printf("couldn't create manager: %s\n", strerror(errno));
 		return 1;
 	}
 	printf("TaskVine listening on %d\n", vine_port(m));
-	printf("Declaring tasks...");
 
 	for(i=0;i<tasksC;i++) {
 		struct vine_task *t = vine_task_create(":");
 		vine_task_set_cores(t, 1);
+
 		int task_id = vine_submit(m, t);
-	}
 
-	printf("waiting for tasks to complete...\n");
-	clock_t start = clock();
+	}
+	bool start_timer = true;
+	clock_t start = 0;
 	while(!vine_empty(m)) {
-		t  = vine_wait(m, 5);
-		if(t) {
-			vine_task_delete(t);
+        struct vine_task *t  = vine_wait(m, 5);
+		if (start_timer){
+			start = clock();
+			start_timer = false;
 		}
-	}
+        if(t) {
+            vine_task_delete(t);
+        }
+    }
 	clock_t end = clock();
-	double time = ((double)(end - start)) / CLOCKS_PER_SEC;
-	double throughput = tasksC / time;
-	printf("all tasks complete!\n");
-	printf("Time was %f seconds\n", time);
+	double throughtput_time = ((double)(end - start)) / CLOCKS_PER_SEC;
+
+	double throughput = tasksC / throughtput_time;
+
 	printf("Throughput was %f tasks per second\n", throughput);
-	//Free the manager structure, and release all the workers.
+	printf("all tasks complete!\n");
+	assert(throughput > 1000);
 	vine_delete(m);
 
 	return 0;
diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index dc13c3a..59f24b9 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -43,11 +43,13 @@
         print("waiting for tasks to complete...")
     end = time.time()
     one = end - start
-
-    print(f"It took {many} seconds\n")
-    print(f"Throughput was {num_tasks/many} tasks per second")
-    print(f"Chaining was {num_tasks/one} tasks per second")
+    throughput = num_tasks/many
+    chaining = num_tasks/one
+    print(f"Throughput was {throughput} tasks per second")
+    print(f"Chaining was {chaining} tasks per second")
     print("all tasks complete!")
+    assert throughput >= 190
+    assert chaining >= 155
     
 # vim: set sts=4 sw=4 ts=4 expandtab ft=python:
 
diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index 914aefd..16ef719 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -9,6 +9,6 @@ source ./install-github.sh
 conda create -yq --prefix ${CONDA_ENV} -c conda-forge --strict-channel-priority ndcctools dask
 conda activate ${CONDA_ENV}
 
-# Run the serverless test case.
+# Run the test case.
 python3 test-vine-task-throughput.py
 python3 test-vine-task-serverless.py
\ No newline at end of file

From 9ed9bdcd23a1d6a1f15f0eaee263ae4b52cb53ab Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 17:41:13 -0500
Subject: [PATCH 06/16] fixes sh file to run c api throughput tests

---
 test-vine-task-chaining.c         | 53 -------------------------------
 test-vine-task-throughput-capi.sh | 12 +++++++
 test-vine-task-throughput.c       | 28 ++++++++++++++--
 3 files changed, 38 insertions(+), 55 deletions(-)
 delete mode 100644 test-vine-task-chaining.c
 create mode 100755 test-vine-task-throughput-capi.sh

diff --git a/test-vine-task-chaining.c b/test-vine-task-chaining.c
deleted file mode 100644
index 348a908..0000000
--- a/test-vine-task-chaining.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "taskvine.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <assert.h>
-int main(int argc, char *argv[])
-{
-	struct vine_manager *m;
-	int i;
-    int tasksC = 5000;
-
-	//Create the manager. All tasks and files will be declared with respect to
-	//this manager.
-	m = vine_create(VINE_DEFAULT_PORT);
-	if(!m) {
-		printf("couldn't create manager: %s\n", strerror(errno));
-		return 1;
-	}
-	printf("TaskVine listening on %d\n", vine_port(m));
-
-	printf("Declaring tasks...");
-	bool start_timer = true;
-	clock_t start = 0;
-	for(i=0;i<tasksC;i++) {
-		struct vine_task *t = vine_task_create(":");
-		vine_task_set_cores(t, 1);
-		if (start_timer){
-			start = clock();
-			start_timer = false;
-		}
-		int task_id = vine_submit(m, t);
-        while(!vine_empty(m)) {
-            t  = vine_wait(m, 5);
-            if(t) {
-                vine_task_delete(t);
-            }
-        }
-	}
-	clock_t end = clock();
-	double time = ((double)(end - start)) / CLOCKS_PER_SEC;
-	double throughput = tasksC / time;
-
-	printf("Throughput was %f tasks per second\n", throughput);
-	printf("all tasks complete!\n");
-	assert(throughput > 1000);
-	vine_delete(m);
-
-	return 0;
-}
diff --git a/test-vine-task-throughput-capi.sh b/test-vine-task-throughput-capi.sh
new file mode 100755
index 0000000..4c27acf
--- /dev/null
+++ b/test-vine-task-throughput-capi.sh
@@ -0,0 +1,12 @@
+
+#!/bin/sh
+
+# Build the sources from github
+. ./install-github.sh
+
+# Compile C API test using environment 
+gcc test-vine-task-throughput.c -o test-vine-task-throughput -I $PREFIX/include/cctools/ -L $PREFIX/lib -ltaskvine -ldttools -lm -lcrypto -lssl -lz
+
+./test-vine-task-throughput & 
+
+vine_worker localhost 9123 --single-shot
\ No newline at end of file
diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
index 9744654..4bc000f 100644
--- a/test-vine-task-throughput.c
+++ b/test-vine-task-throughput.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
     int tasksC = 5000;
 
 	m = vine_create(VINE_DEFAULT_PORT);
-	printf("%d", VINE_DEFAULT_PORT);
+
 	if(!m) {
 		printf("couldn't create manager: %s\n", strerror(errno));
 		return 1;
@@ -44,10 +44,34 @@ int main(int argc, char *argv[])
 	double throughtput_time = ((double)(end - start)) / CLOCKS_PER_SEC;
 
 	double throughput = tasksC / throughtput_time;
+	
+	start_timer = true;
+	start = 0;
+	for(i=0;i<tasksC;i++) {
+		struct vine_task *t = vine_task_create(":");
+		vine_task_set_cores(t, 1);
+		if (start_timer){
+			start = clock();
+			start_timer = false;
+		}
+		int task_id = vine_submit(m, t);
+        while(!vine_empty(m)) {
+            t  = vine_wait(m, 5);
+            if(t) {
+                vine_task_delete(t);
+            }
+        }
+	}
+	end = clock();
+	double chaining_time = ((double)(end - start)) / CLOCKS_PER_SEC;
+	double chaining = tasksC / chaining_time;
 
 	printf("Throughput was %f tasks per second\n", throughput);
-	printf("all tasks complete!\n");
 	assert(throughput > 1000);
+
+	printf("Chaining was %f tasks per second\n", chaining);
+	printf("all tasks complete!\n");
+	assert(chaining > 1000);
 	vine_delete(m);
 
 	return 0;

From b29dbea27f4ac37cb3ce1c2591055eafeff44971 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 17:50:32 -0500
Subject: [PATCH 07/16] fix python throughput test

---
 test-vine-task-throughput.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index 16ef719..8103319 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -4,10 +4,7 @@
 . ./install-conda-devel.sh
 
 # Install conda development environment
-source ./install-github.sh
-
-conda create -yq --prefix ${CONDA_ENV} -c conda-forge --strict-channel-priority ndcctools dask
-conda activate ${CONDA_ENV}
+. ./install-github.sh
 
 # Run the test case.
 python3 test-vine-task-throughput.py

From af48065d879a643f9694fbbff263afa1286a3d63 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 17:57:37 -0500
Subject: [PATCH 08/16] adds sys library

---
 test-vine-task-severless.py  | 3 ++-
 test-vine-task-throughput.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test-vine-task-severless.py b/test-vine-task-severless.py
index 8a95d07..cea6afb 100755
--- a/test-vine-task-severless.py
+++ b/test-vine-task-severless.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import ndcctools.taskvine as vine
 import time
+import sys
 
 def func():
     return 
@@ -45,7 +46,7 @@ def main():
     throughput = num_tasks/many
     chaining = num_tasks/one
 
-    print(f"Throughput was {throughput} tasks per second")
+    print(f"\nThroughput was {throughput} tasks per second")
     print(f"Chaining was {chaining} tasks per second")
     print("all tasks complete!")
     assert throughput >= 110
diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index 59f24b9..3238645 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -2,6 +2,7 @@
 
 import ndcctools.taskvine as vine
 import time
+import sys
 
 if __name__ == "__main__":
 
@@ -45,7 +46,7 @@
     one = end - start
     throughput = num_tasks/many
     chaining = num_tasks/one
-    print(f"Throughput was {throughput} tasks per second")
+    print(f"\nThroughput was {throughput} tasks per second")
     print(f"Chaining was {chaining} tasks per second")
     print("all tasks complete!")
     assert throughput >= 190

From 38fa65efe71a494092815892b290e18db25f3d0d Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 18:19:44 -0500
Subject: [PATCH 09/16] debug python throughput

---
 test-vine-task-throughput.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index 8103319..c78e79f 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -7,5 +7,5 @@
 . ./install-github.sh
 
 # Run the test case.
-python3 test-vine-task-throughput.py
-python3 test-vine-task-serverless.py
\ No newline at end of file
+python test-vine-task-throughput.py
+python test-vine-task-serverless.py
\ No newline at end of file

From fe8e180e31ed403b4eb0c9606558a07c12de81d7 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 18:27:59 -0500
Subject: [PATCH 10/16]  Please enter the commit message for your changes.
 Lines starting

---
 test-vine-task-throughput.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index c78e79f..8000383 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -7,5 +7,5 @@
 . ./install-github.sh
 
 # Run the test case.
-python test-vine-task-throughput.py
-python test-vine-task-serverless.py
\ No newline at end of file
+python test-vine-task-serverless.py
+python test-vine-task-throughput.py
\ No newline at end of file

From c14daf3e239000fbbf1a3560d30e29236dced2c9 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 18:33:43 -0500
Subject: [PATCH 11/16] rename serverless integration test

---
 test-vine-task-severless.py => test-vine-task-serverless.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test-vine-task-severless.py => test-vine-task-serverless.py (100%)

diff --git a/test-vine-task-severless.py b/test-vine-task-serverless.py
similarity index 100%
rename from test-vine-task-severless.py
rename to test-vine-task-serverless.py

From 13d79dfe7c5fec198adfa7893a641812ff37d5a4 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 18:38:13 -0500
Subject: [PATCH 12/16] throughput debuging

---
 test-vine-task-throughput.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index 3238645..d1be66f 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -11,7 +11,6 @@
     factory = vine.Factory("local",manager_host_port="localhost:{}".format(q.port))
     factory.max_workers=1
     factory.min_workers=1
-    factory.disk = 100
 
     num_tasks = 1000
 

From 30fbb7bac208b36ebded166adccb9f49fd4a02b4 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Mon, 2 Dec 2024 18:48:05 -0500
Subject: [PATCH 13/16] fixed throughput python api test

---
 test-vine-task-throughput.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index d1be66f..513ef7a 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -4,7 +4,7 @@
 import time
 import sys
 
-if __name__ == "__main__":
+def main():
 
     q = vine.Manager()
     print("listening on port", q.port)
@@ -29,11 +29,11 @@
                 start = time.time()
                 start_timer = False
     
-    end = time.time()
-    many = end - start
+        end = time.time()
+        many = end - start
 
-    start = time.time()
-    with factory:
+        start = time.time()
+    
         for i in range(num_tasks):
             while not q.empty():
                 result = q.wait(5)
@@ -41,8 +41,8 @@
             task_id = q.submit(t)
 
         print("waiting for tasks to complete...")
-    end = time.time()
-    one = end - start
+        end = time.time()
+        one = end - start
     throughput = num_tasks/many
     chaining = num_tasks/one
     print(f"\nThroughput was {throughput} tasks per second")
@@ -50,6 +50,9 @@
     print("all tasks complete!")
     assert throughput >= 190
     assert chaining >= 155
-    
+
+if __name__ == '__main__':
+    main()
+
 # vim: set sts=4 sw=4 ts=4 expandtab ft=python:
 

From 67632b40dba1d07375fc3370c4a3d37927b02fcf Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@crcfe01.crc.nd.edu>
Date: Mon, 2 Dec 2024 22:11:44 -0500
Subject: [PATCH 14/16] combines serverless to one file and adds different
 error messages

---
 test-vine-task-serverless.py | 56 ------------------------------------
 test-vine-task-throughput.py | 48 +++++++++++++++++++++++++++----
 test-vine-task-throughput.sh |  1 -
 3 files changed, 43 insertions(+), 62 deletions(-)
 delete mode 100755 test-vine-task-serverless.py

diff --git a/test-vine-task-serverless.py b/test-vine-task-serverless.py
deleted file mode 100755
index cea6afb..0000000
--- a/test-vine-task-serverless.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-import ndcctools.taskvine as vine
-import time
-import sys
-
-def func():
-    return 
-
-def main():
-    print("Creating TaskVine manager...")
-    q = vine.Manager()
-    num_tasks = 1000
-    print("Creating Library from functions...")
-    function_lib = q.create_library_from_functions('test-library', func, add_env=False)
-    q.install_library(function_lib)
-
-    print("Starting worker factory for port {}...".format(q.port))
-    factory = vine.Factory("local",manager_host_port="localhost:{}".format(q.port))
-    factory.max_workers=1
-    factory.min_workers=1
-    
-    with factory:
-        print("Submitting tasks...")
-        for i in range (num_tasks):
-            t = vine.FunctionCall('test-library', 'func')
-            task_id = q.submit(t)
-
-        print("Waiting for tasks to complete...")
-        start_timer = True
-        while not q.empty():
-            t = q.wait(5)
-            if start_timer:
-                start = time.time()
-                start_timer = False
-        end = time.time()
-        many = end - start
-
-        start = time.time()
-        for i in range(num_tasks):
-            while not q.empty():
-                result = q.wait(5)
-            t = vine.FunctionCall('test-library', 'func')
-            task_id = q.submit(t)
-        end = time.time()
-        one = end-start
-    throughput = num_tasks/many
-    chaining = num_tasks/one
-
-    print(f"\nThroughput was {throughput} tasks per second")
-    print(f"Chaining was {chaining} tasks per second")
-    print("all tasks complete!")
-    assert throughput >= 110
-    assert chaining >= 50
-
-if __name__ == '__main__':
-    main()
diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index 513ef7a..0455192 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -4,9 +4,16 @@
 import time
 import sys
 
+def func():
+    return 
+
 def main():
 
     q = vine.Manager()
+    print("Creating Library from functions...")
+    function_lib = q.create_library_from_functions('test-library', func, add_env=False)
+    q.install_library(function_lib)
+
     print("listening on port", q.port)
     factory = vine.Factory("local",manager_host_port="localhost:{}".format(q.port))
     factory.max_workers=1
@@ -43,14 +50,45 @@ def main():
         print("waiting for tasks to complete...")
         end = time.time()
         one = end - start
-    throughput = num_tasks/many
-    chaining = num_tasks/one
+        throughput = num_tasks/many
+        chaining = num_tasks/one
+        #serverless tasks
+        for i in range (num_tasks):
+            t = vine.FunctionCall('test-library', 'func')
+            task_id = q.submit(t)
+
+        print("Waiting for tasks to complete...")
+        start_timer = True
+        while not q.empty():
+            t = q.wait(5)
+            if start_timer:
+                start = time.time()
+                start_timer = False
+        end = time.time()
+        serverless_many = end - start
+
+        start = time.time()
+        for i in range(num_tasks):
+            while not q.empty():
+                result = q.wait(5)
+            t = vine.FunctionCall('test-library', 'func')
+            task_id = q.submit(t)
+        end = time.time()
+        serverless_one = end-start
+    serverless_throughput = num_tasks/serverless_many
+    serverless_chaining = num_tasks/serverless_one
+
+    
     print(f"\nThroughput was {throughput} tasks per second")
     print(f"Chaining was {chaining} tasks per second")
+    print(f"\nServerless Throughput was {serverless_throughput} tasks per second")
+    print(f"Serverless Chaining was {serverless_chaining} tasks per second")
     print("all tasks complete!")
-    assert throughput >= 190
-    assert chaining >= 155
-
+    assert throughput >= 190, "Throughput in python api is less than required 190"
+    assert chaining >= 155, "Throughput for chaining in python api is less than required 155"
+    assert serverless_throughput >= 110, "Throughput using serverless is less than required 190"
+    assert serverless_chaining >= 50, "Throughput for chaining using serverless is less than required 155"
+    
 if __name__ == '__main__':
     main()
 
diff --git a/test-vine-task-throughput.sh b/test-vine-task-throughput.sh
index 8000383..cf0f576 100755
--- a/test-vine-task-throughput.sh
+++ b/test-vine-task-throughput.sh
@@ -7,5 +7,4 @@
 . ./install-github.sh
 
 # Run the test case.
-python test-vine-task-serverless.py
 python test-vine-task-throughput.py
\ No newline at end of file

From 083fc4646c4add2297350727e45b02898e48ece2 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@crcfe01.crc.nd.edu>
Date: Mon, 2 Dec 2024 22:18:14 -0500
Subject: [PATCH 15/16] adjusting required throughput

---
 test-vine-task-throughput.c  |  4 ++--
 test-vine-task-throughput.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
index 4bc000f..34bd1fc 100644
--- a/test-vine-task-throughput.c
+++ b/test-vine-task-throughput.c
@@ -67,11 +67,11 @@ int main(int argc, char *argv[])
 	double chaining = tasksC / chaining_time;
 
 	printf("Throughput was %f tasks per second\n", throughput);
-	assert(throughput > 1000);
+	assert(throughput > 900);
 
 	printf("Chaining was %f tasks per second\n", chaining);
 	printf("all tasks complete!\n");
-	assert(chaining > 1000);
+	assert(chaining > 1500);
 	vine_delete(m);
 
 	return 0;
diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index 0455192..68df026 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -84,11 +84,11 @@ def main():
     print(f"\nServerless Throughput was {serverless_throughput} tasks per second")
     print(f"Serverless Chaining was {serverless_chaining} tasks per second")
     print("all tasks complete!")
-    assert throughput >= 190, "Throughput in python api is less than required 190"
-    assert chaining >= 155, "Throughput for chaining in python api is less than required 155"
-    assert serverless_throughput >= 110, "Throughput using serverless is less than required 190"
-    assert serverless_chaining >= 50, "Throughput for chaining using serverless is less than required 155"
-    
+    assert throughput >= 570, "Throughput in python api is less than required 190"
+    assert chaining >= 510, "Throughput for chaining in python api is less than required 155"
+    assert serverless_throughput >= 220, "Throughput using serverless is less than required 190"
+    assert serverless_chaining >= 200, "Throughput for chaining using serverless is less than required 155"
+
 if __name__ == '__main__':
     main()
 

From 0dad4bb3d1e31c7f4a9a1d389aa92a49b212afa0 Mon Sep 17 00:00:00 2001
From: Elliot Kim <ekim33@cclws17.cse.nd.edu>
Date: Wed, 4 Dec 2024 15:02:49 -0500
Subject: [PATCH 16/16] removes assert and just prints throughput

---
 test-vine-task-throughput.c  | 3 ---
 test-vine-task-throughput.py | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/test-vine-task-throughput.c b/test-vine-task-throughput.c
index 34bd1fc..9eb4671 100644
--- a/test-vine-task-throughput.c
+++ b/test-vine-task-throughput.c
@@ -67,11 +67,8 @@ int main(int argc, char *argv[])
 	double chaining = tasksC / chaining_time;
 
 	printf("Throughput was %f tasks per second\n", throughput);
-	assert(throughput > 900);
-
 	printf("Chaining was %f tasks per second\n", chaining);
 	printf("all tasks complete!\n");
-	assert(chaining > 1500);
 	vine_delete(m);
 
 	return 0;
diff --git a/test-vine-task-throughput.py b/test-vine-task-throughput.py
index 68df026..916b46b 100644
--- a/test-vine-task-throughput.py
+++ b/test-vine-task-throughput.py
@@ -81,13 +81,10 @@ def main():
     
     print(f"\nThroughput was {throughput} tasks per second")
     print(f"Chaining was {chaining} tasks per second")
-    print(f"\nServerless Throughput was {serverless_throughput} tasks per second")
+    print(f"Serverless Throughput was {serverless_throughput} tasks per second")
     print(f"Serverless Chaining was {serverless_chaining} tasks per second")
     print("all tasks complete!")
-    assert throughput >= 570, "Throughput in python api is less than required 190"
-    assert chaining >= 510, "Throughput for chaining in python api is less than required 155"
-    assert serverless_throughput >= 220, "Throughput using serverless is less than required 190"
-    assert serverless_chaining >= 200, "Throughput for chaining using serverless is less than required 155"
+
 
 if __name__ == '__main__':
     main()