harmonytask cleanups

.circleci/config.yml

@@ -783,6 +783,12 @@ workflows:
             - build
           suite: itest-harmonydb
           target: "./itests/harmonydb_test.go"
+      - test:
+          name: test-itest-harmonytask
+          requires:
+            - build
+          suite: itest-harmonytask
+          target: "./itests/harmonytask_test.go"
       - test:
           name: test-itest-lite_migration
           requires:

go.mod

@@ -135,7 +135,6 @@ require (
 	github.com/raulk/clock v1.1.0
 	github.com/raulk/go-watchdog v1.3.0
 	github.com/samber/lo v1.38.1
-	github.com/samuel/go-opencl v0.0.0-20171108220231-cbcfd10c32ad
 	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/urfave/cli/v2 v2.25.5

itests/harmonytask_test.go

@@ -50,7 +50,8 @@ func (t *task1) TypeDetails() harmonytask.TaskTypeDetails {
 	}
 }
 func (t *task1) Adder(add harmonytask.AddTaskFunc) {
-	for _, v := range t.toAdd {
+	for _, vTmp := range t.toAdd {
+		v := vTmp
 		add(func(tID harmonytask.TaskID, tx *harmonydb.Tx) bool {
 			t.myPersonalTableLock.Lock()
 			defer t.myPersonalTableLock.Unlock()
@@ -115,7 +116,8 @@ func fooLetterAdder(t *testing.T, cdb *harmonydb.DB) *passthru {
 		dtl:       dtl,
 		canAccept: func(list []harmonytask.TaskID) (*harmonytask.TaskID, error) { return nil, nil },
 		adder: func(add harmonytask.AddTaskFunc) {
-			for _, v := range []string{"A", "B"} {
+			for _, vTmp := range []string{"A", "B"} {
+				v := vTmp
 				add(func(tID harmonytask.TaskID, tx *harmonydb.Tx) bool {
 					_, err := tx.Exec("INSERT INTO itest_scratch (some_int, content) VALUES ($1,$2)", tID, v)
 					require.NoError(t, err)

lib/harmony/harmonytask/harmonytask.go

@@ -248,10 +248,10 @@ func (e *TaskEngine) followWorkInDB() {
 	var lastFollowTime time.Time
 	lastFollowTime, e.lastFollowTime = e.lastFollowTime, time.Now()
 
-	for from_name, srcs := range e.follows {
+	for fromName, srcs := range e.follows {
 		var cList []int // Which work is done (that we follow) since we last checked?
 		err := e.db.Select(e.ctx, &cList, `SELECT h.task_id FROM harmony_task_history 
-   		WHERE h.work_end>$1 AND h.name=$2`, lastFollowTime, from_name)
+   		WHERE h.work_end>$1 AND h.name=$2`, lastFollowTime, fromName)
 		if err != nil {
 			log.Error("Could not query DB: ", err)
 			return
@@ -269,9 +269,9 @@ func (e *TaskEngine) followWorkInDB() {
 					continue
 				}
 				// we need to create this task
-				if !src.h.Follows[from_name](TaskID(workAlreadyDone), src.h.AddTask) {
+				if !src.h.Follows[fromName](TaskID(workAlreadyDone), src.h.AddTask) {
 					// But someone may have beaten us to it.
-					log.Infof("Unable to add task %s following Task(%d, %s)", src.h.Name, workAlreadyDone, from_name)
+					log.Infof("Unable to add task %s following Task(%d, %s)", src.h.Name, workAlreadyDone, fromName)
 				}
 			}
 		}
@@ -317,7 +317,7 @@ func (e *TaskEngine) GetHttpHandlers() http.Handler {
 	s := root.PathPrefix("/scheduler")
 	f := s.PathPrefix("/follows")
 	b := s.PathPrefix("/bump")
-	for name, v := range e.follows {
+	for name, vs := range e.follows {
 		f.Path("/" + name + "/{tID}").Methods("GET").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			tIDString := mux.Vars(r)["tID"]
 			tID, err := strconv.Atoi(tIDString)
@@ -327,7 +327,7 @@ func (e *TaskEngine) GetHttpHandlers() http.Handler {
 				return
 			}
 			taskAdded := false
-			for _, v := range v {
+			for _, v := range vs {
 				taskAdded = taskAdded || v.f(TaskID(tID), v.h.AddTask)
 			}
 			if taskAdded {
@@ -338,7 +338,8 @@ func (e *TaskEngine) GetHttpHandlers() http.Handler {
 			w.WriteHeader(202) // NOTE: 202 for "accepted" but not worked.
 		})
 	}
-	for _, h := range e.handlers {
+	for _, hTmp := range e.handlers {
+		h := hTmp
 		b.Path("/" + h.Name + "/{tID}").Methods("GET").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			tIDString := mux.Vars(r)["tID"]
 			tID, err := strconv.Atoi(tIDString)

lib/harmony/resources/miniopencl/cl.h

@@ -6,6 +6,8 @@
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
 #define CL_USE_DEPRECATED_OPENCL_2_0_APIS
 
+#define CL_TARGET_OPENCL_VERSION 300
+
 #ifdef __APPLE__
 #include "OpenCL/opencl.h"
 #else