Debug for ahc029

Makefile

@@ -18,7 +18,7 @@ WORKER_DIR=./cmd/worker
 build: $(BINARIES)
 $(BINARIES): $(GO_FILES)
 	@echo "Building..."
-	go build -o $(BUILD_DIR)/$(BINARY_NAME) $(CMD_DIR)
+	go build -race -o $(BUILD_DIR)/$(BINARY_NAME) $(CMD_DIR)
 
 # 実行ファイルのクリーンアップ
 .PHONY: clean

cloudCompile.go

@@ -14,16 +14,16 @@ import (
 
 func checkConfigCloudCompile(config *Config) error {
 	if config.Source == "" {
-		return ErrorTrace("error: [SourcePath] must not be empty", nil)
+		return NewStackTraceError("error: [SourcePath] must not be empty")
 	}
 	if config.Binary == "" {
-		return ErrorTrace("error: [BinaryPath] must not be empty", nil)
+		return NewStackTraceError("error: [BinaryPath] must not be empty")
 	}
 	if config.CompileCmd == "" {
-		return ErrorTrace("error: [CompileCmd] must not be empty", nil)
+		return NewStackTraceError("error: [CompileCmd] must not be empty")
 	}
 	if config.CompilerURL == "" {
-		return ErrorTrace("error: [CompilerURL] must not be empty", nil)
+		return NewStackTraceError("error: [CompilerURL] must not be empty")
 	}
 	return nil
 }
@@ -37,24 +37,24 @@ func checkConfigCloudCompile(config *Config) error {
 func CloudCompile(config *Config) error {
 	log.Println("cloud compiling...")
 	if err := checkConfigCloudCompile(config); err != nil {
-		return ErrorTrace("invalid config: %w", err)
+		return err
 	}
 	// ソースファイルを開く
 	file, err := os.Open(config.Source)
 	if err != nil {
-		return ErrorTrace("error opening file: %w", err)
+		return err
 	}
 	defer file.Close()
 	// マルチパートフォームを作成
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
 	part, err := writer.CreateFormFile("file", filepath.Base(config.Source))
 	if err != nil {
-		return ErrorTrace("error creating form file: %w", err)
+		return err
 	}
 	_, err = io.Copy(part, file)
 	if err != nil {
-		return ErrorTrace("error writing to form file: %w", err)
+		return err
 	}
 	writer.WriteField("sourcePath", config.Source)
 	writer.WriteField("compileCmd", config.CompileCmd)
@@ -67,32 +67,32 @@ func CloudCompile(config *Config) error {
 	req, err := http.NewRequest("POST", config.CompilerURL, body)
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 	if err != nil {
-		return ErrorTrace("error making new requets: %w", err)
+		return err
 	}
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return ErrorTrace("error making request: %w", err)
+		return err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		bodyBytes, err := io.ReadAll(resp.Body)
 		if err != nil {
-			return ErrorTrace("error reading response body: %w", err)
+			return err
 		}
-		fmt.Print("server response:", string(bodyBytes), "url:", config.CompilerURL, "\n")
-		return ErrorTrace(string(bodyBytes), fmt.Errorf("error response status code: %d", resp.StatusCode))
+		msg := fmt.Sprint("server response:", string(bodyBytes), "url:", config.CompilerURL, "\n")
+		return NewStackTraceError(msg)
 	}
 
 	// cloud storageに保存したバイナルの名前を取得
 	content := resp.Header.Get("Content-Disposition")
 	_, params, err := mime.ParseMediaType(content)
 	if err != nil {
-		return ErrorTrace("error parsing media type: %w", err)
+		return err
 	}
 	filename := params["filename"]
 	config.TmpBinary = filename
-
+	log.Println("cloud compile done:", filename)
 	return nil
 }

cloudDir.go

@@ -8,20 +8,20 @@ import (
 	"path/filepath"
 )
 
-//go:embed cmd/compiler/*
+//go:embed cmd/compiler/script/*
 var compilerFiles embed.FS
 
-//go:embed cmd/worker/*
+//go:embed cmd/worker/script/*
 var workerFiles embed.FS
 
 func mkDirCompilerBase() {
 	targetDir := "./fj/compiler/"
-	extractEmbeddedFiles(compilerFiles, "cmd/compiler", targetDir)
+	extractEmbeddedFiles(compilerFiles, "cmd/compiler/script", targetDir)
 }
 
 func mkDirWorkerBase() {
 	targetDir := "./fj/worker/"
-	extractEmbeddedFiles(workerFiles, "cmd/worker", targetDir)
+	extractEmbeddedFiles(workerFiles, "cmd/worker/script", targetDir)
 }
 
 func extractEmbeddedFiles(embeddedFS embed.FS, sourcdDir, targetDir string) {

cloudWorker.go

@@ -9,23 +9,25 @@ import (
 	"mime/multipart"
 	"net/http"
 	"time"
+
+	"github.com/elliotchance/orderedmap/v2"
 )
 
 // requestToWorker はバイナリをワーカーに送信する
-func requestToWorker(config *Config, seed int) (rtn map[string]float64, err error) {
+func requestToWorker(config *Config, seed int) (*orderedmap.OrderedMap[string, any], error) {
 	start := time.Now()
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
 
 	// configをJSONに変換
 	configData, err := json.Marshal(config)
 	if err != nil {
-		return nil, ErrorTrace("failed to marshal config: %v", err)
+		return nil, NewStackTraceError(err.Error())
 	}
 	// JSON configを追加
 	configPart, err := writer.CreateFormField("config")
 	if err != nil {
-		return nil, ErrorTrace("failed to create form field for config: %v", err)
+		return nil, NewStackTraceError(err.Error())
 	}
 	configPart.Write(configData)
 
@@ -50,33 +52,38 @@ func requestToWorker(config *Config, seed int) (rtn map[string]float64, err erro
 	if resp.StatusCode != http.StatusOK {
 		bodyBytes, err := io.ReadAll(resp.Body)
 		if err != nil {
-			return nil, ErrorTrace("error reading response body: %w", err)
+			return nil, WrapError(err)
 		}
-		return nil, ErrorTrace(fmt.Sprintf("error response status code:%d resp:%s", resp.StatusCode, string(bodyBytes)), err)
+		return nil, NewStackTraceError(fmt.Sprintf("error response status code:%d resp:%s", resp.StatusCode, string(bodyBytes)))
 	}
 
 	// レスポンスボディから文字列を取り出す
 	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read response body: %v", err)
 	}
-	if err := json.Unmarshal(bodyBytes, &rtn); err != nil {
+	rtn := orderedmap.NewOrderedMap[string, any]()
+	if err := json.Unmarshal(bodyBytes, (*EncodableOrderedMap)(rtn)); err != nil {
 		return nil, fmt.Errorf("failed to parse response body: %v", err)
 	}
 	elapsed := time.Since(start)
-	rtn["responseTime"] = elapsed.Seconds()
-	if rtn["Score"] == 0 {
-		log.Println("response body:", string(bodyBytes))
+	rtn.Set("responseTime", elapsed.Seconds())
+	score, ok := rtn.Get("Score")
+	if !ok {
+		return nil, fmt.Errorf("failed to get score from response body: %v", err)
+	}
+	if score == 0.0 {
+		log.Println("Score=0:response body:", string(bodyBytes))
 	}
 	return rtn, nil
 }
 
-func SendBinaryToWorker(config *Config, seed int, binaryNameInBucket string) (rtn map[string]float64, err error) {
+func SendBinaryToWorker(config *Config, seed int, binaryNameInBucket string) (*orderedmap.OrderedMap[string, any], error) {
 	if config.WorkerURL == "" {
-		return nil, ErrorTrace("", fmt.Errorf("worker URL is not specified"))
+		return nil, NewStackTraceError("worker URL is not specified")
 	}
 	if config.Binary == "" {
-		return nil, ErrorTrace("", fmt.Errorf("binary path is not specified"))
+		return nil, NewStackTraceError("binary path is not specified")
 	}
 	return requestToWorker(config, seed)
 }

cmd/compiler/script/Dockerfile

@@ -0,0 +1,36 @@
+FROM golang:1.21 as serverbuild
+
+WORKDIR /app
+
+RUN git clone https://github.com/fmhr/fj.git \
+    && cd fj \
+    && go mod tidy
+
+WORKDIR /app/fj/cmd/compiler
+
+RUN go build -o /app/server
+
+
+
+FROM ubuntu:latest
+
+WORKDIR /work
+
+RUN apt-get update && apt-get install -y \
+    apt-utils \
+    wget \
+    unzip \
+    gzip
+
+COPY . /work
+RUN sh install_go.sh
+ENV PATH $PATH:/opt/go/bin
+# RUN sh install_cpp20.sh
+
+COPY --from=serverbuild /app/server /work
+
+RUN chmod +x /work/server
+
+EXPOSE $PORT
+
+CMD ["/work/server"]

cmd/compiler/script/compile.csv

@@ -0,0 +1,2 @@
+Go,"go build -o a.out"
+C++20,"g++-12 -std=gnu++2b -O2 -DONLINE_JUDGE -DATCODER -Wall -Wextra -mtune=native -march=native -fconstexpr-depth=2147483647 -fconstexpr-loop-limit=2147483647 -fconstexpr-ops-limit=2147483647 -I/opt/ac-library -I/opt/boost/gcc/include -L/opt/boost/gcc/lib -o a.out Main.cpp -lgmpxx -lgmp -I/usr/include/eigen3"

cmd/compiler/script/install_cpp20.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+apt-get update
+apt-get install -y g++-12
+apt-get install -y libgmp3-dev
+
+# /tmpディレクトリに移動してから作業を行う
+cd /tmp
+
+# ac-libraryのダウンロードとインストール
+mkdir -p /opt/ac-library
+wget https://github.com/atcoder/ac-library/releases/download/v1.5.1/ac-library.zip -O ac-library.zip
+unzip /tmp/ac-library.zip -d /opt/ac-library
+
+# boostのダウンロードとインストール
+apt-get install -y build-essential
+# wget https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz -O boost_1_82_0.tar.gz
+wget https://github.com/boostorg/boost/releases/download/boost-1.82.0/boost-1.82.0.tar.gz -O boost_1_82_0.tar.gz
+tar xf boost_1_82_0.tar.gz
+cd boost-1.82.0
+./bootstrap.sh --with-toolset=gcc --without-libraries=mpi,graph_parallel
+./b2 -j3 toolset=gcc variant=release link=static runtime-link=static cxxflags="-std=c++20" stage
+./b2 -j3 toolset=gcc variant=release link=static runtime-link=static cxxflags="-std=c++20" --prefix=/opt/boost/gcc install
+
+# Eigenのインストール
+apt-get install -y libeigen3-dev=3.4.0-2ubuntu2

cmd/compiler/install_go.sh → cmd/compiler/script/install_go.sh

@@ -1,7 +1,8 @@
 cd /tmp                                    
-wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz
+wget -q https://go.dev/dl/go1.20.6.linux-amd64.tar.gz
 tar -C /opt -xf go1.20.6.linux-amd64.tar.gz
-export PATH=$PATH:/opt/go/bin
+export PATH=$PATH:/opt/go/bin # 一時的にパスを通す　コンテナには反映されない
+
 mkdir -p /go/src/atcoder.jp/golang
 cd /go/src/atcoder.jp/golang
 go mod init atcoder.jp/golang

cmd/fj/main.go

@@ -1,7 +1,12 @@
 package main
 
-import "github.com/fmhr/fj"
+import (
+	"log"
+
+	"github.com/fmhr/fj"
+)
 
 func main() {
+	log.SetFlags(log.Lshortfile)
 	fj.Fj()
 }