fix: disable race check for go tests and cicd improvements

Author: riccardopinosio

.github/workflows/release.yaml

@@ -33,7 +33,7 @@ jobs:
         run: |
           go mod download
       - name: Build and run tests
-        run: ./scripts/run-unit-tests.sh ALL
+        run: ./scripts/run-unit-tests.sh
       - name: Install goveralls
         run: go install github.com/mattn/goveralls@latest
       - name: Send coverage

.github/workflows/test.yaml

@@ -23,13 +23,16 @@ jobs:
         run: |
           go mod download
       - name: Build and run tests
-        run: ./scripts/run-unit-tests.sh ALL
+        run: ./scripts/run-unit-tests.sh
       - name: Install goveralls
         run: go install github.com/mattn/goveralls@latest
+      - name: list files
+        run: |
+          ls -R ./testTarget/unit
       - name: Send coverage
         env:
           COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-        run: goveralls -coverprofile=./testTarget/unit/cover.out -service=github
+        run: goveralls -coverprofile=./testTarget/unit/cover.final.out -service=github
       - uses: actions/upload-artifact@v4
         with:
           name: libtokenizers.a

compose-test.yaml

@@ -23,7 +23,6 @@ services:
     environment:
       - HOST_UID=$host_uid
       - CI=$CI
-      - HUGOT_BUILD_TAG=$HUGOT_BUILD_TAG
     command: /run-unit-tests-container.sh
     # deploy:
     #   resources:

hugot_go_test.go

@@ -1,8 +1,11 @@
+//go:build GO || ALL
+
 package hugot
 
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"testing"
 )
 
@@ -129,7 +132,7 @@ func TestCrossEncoderPipelineValidationGo(t *testing.T) {
 // Image classification
 
 func TestImageClassificationPipelineGo(t *testing.T) {
-	session, err := NewXLASession()
+	session, err := NewGoSession()
 	checkT(t, err)
 	defer func(session *Session) {
 		destroyErr := session.Destroy()
@@ -139,7 +142,7 @@ func TestImageClassificationPipelineGo(t *testing.T) {
 }
 
 func TestImageClassificationPipelineValidationGo(t *testing.T) {
-	session, err := NewXLASession()
+	session, err := NewGoSession()
 	checkT(t, err)
 	defer func(session *Session) {
 		destroyErr := session.Destroy()
@@ -173,6 +176,9 @@ func TestDestroyPipelineGo(t *testing.T) {
 // Thread safety
 
 func TestThreadSafetyGo(t *testing.T) {
+	if os.Getenv("CI") != "" {
+		t.SkipNow()
+	}
 	session, err := NewGoSession()
 	checkT(t, err)
 	defer func(session *Session) {

hugot_test.go

@@ -916,7 +916,7 @@ func imageClassificationPipeline(t *testing.T, session *Session) {
 func imageClassificationPipelineValidation(t *testing.T, session *Session) {
 	t.Helper()
 
-	modelPath := "./models/KnightsAnalytics_resnet50-onnx"
+	modelPath := "./models/KnightsAnalytics_resnet50"
 	config := ImageClassificationConfig{
 		ModelPath: modelPath,
 		Name:      "testImageClassification",

hugot_training_test.go

@@ -1,4 +1,4 @@
-//go:build (ORT && XLA) || ALL
+//go:build (ORT && XLA && TRAINING) || ALL
 
 package hugot
 

scripts/run-unit-tests-container.sh

@@ -2,20 +2,45 @@
 
 set -e
 
+folder=/test/unit
+
 cd /build && \
-mkdir -p /test/unit && \
+mkdir -p $folder && \
 go run ./testData/downloadModels.go
 
-echo HUGOT_BUILD_TAG is "$HUGOT_BUILD_TAG"
+echo "Running ORT tests..."
+
+gotestsum --format testname --junitfile=$folder/unit-onnx.xml --jsonfile=$folder/unit-onnx.json -- -coverprofile=$folder/cover-ort.out -coverpkg ./... -tags=ORT -timeout 60m -race
+
+echo "ORT tests completed."
+
+echo "Running XLA tests..."
+
+gotestsum --format testname --junitfile=$folder/unit-xla.xml --jsonfile=$folder/unit-xla.json -- -coverprofile=$folder/cover-xla.out -coverpkg ./... -tags=XLA -timeout 60m -race
+
+echo "XLA tests completed."
+
+echo "Running training tests..."
+
+gotestsum --format testname --junitfile=$folder/unit-training.xml --jsonfile=$folder/unit-training.json -- -coverprofile=$folder/cover-training.out -coverpkg ./... -tags=ORT,XLA,TRAINING -timeout 60m -race
+
+echo "Training tests completed."
+
+# echo "Running simplego tests..."
+
+# gotestsum --format testname --junitfile=$folder/unit-go.xml --jsonfile=$folder/unit-go.json -- -tags=GO -timeout 60m
+
+# echo "simplego tests completed."
 
-if [[ -n $HUGOT_BUILD_TAG ]]; then 
-    echo "running with -tags=ALL"
-    gotestsum --junitfile=/test/unit/unit.xml --jsonfile=/test/unit/unit.json -- -tags=ALL -coverprofile=/test/unit/cover.out.pre -coverpkg ./... -timeout 60m -race -covermode=atomic ./...
-else 
-    echo "running without build tags"
-    gotestsum --junitfile=/test/unit/unit.xml --jsonfile=/test/unit/unit.json -- -coverprofile=/test/unit/cover.out.pre  ./... -timeout 60m -race -covermode=atomic ./...
-fi
+Merge coverage files manually
+echo "merging coverage"
+head -n 1 $folder/cover-ort.out > $folder/cover.out
+tail -n +2 $folder/cover-ort.out >> $folder/cover.out
+tail -n +2 $folder/cover-xla.out >> $folder/cover.out
+tail -n +2 $folder/cover-training.out >> $folder/cover.out
+# tail -n +2 $folder/cover-go.out >> $folder/cover.out
 
-grep -v "downloadModels.go" /test/unit/cover.out.pre > /test/unit/cover.out && rm  /test/unit/cover.out.pre
+# # Optionally, remove downloadModels.go lines
+grep -v "downloadModels.go" $folder/cover.out > $folder/cover.final.out
 
-echo Done.
+echo Done.

scripts/run-unit-tests.sh

@@ -15,20 +15,6 @@ mkdir -p "$test_folder"
 host_uid=$(id -u "$USER")
 export host_uid
 
-if [ $# -eq 0 ]; then
-    echo "running without build tags"
-    export HUGOT_BUILD_TAG=""
-else
-    first_arg=$1
-    if [[ $first_arg == "ALL" ]]; then
-        echo "running with build tag ALL"
-        export HUGOT_BUILD_TAG="ALL"
-    else
-        echo "build tag $first_arg is not supported"
-        exit 1
-    fi
-fi
-
 # build with compose
 docker compose -f "$src_dir/compose-test.yaml" build hugot && \
 docker compose -f "$src_dir/compose-test.yaml" build hugot-test