Ryt Embed cvm-runtime into CortexTheseus

.github/workflows/go.yml

@@ -43,6 +43,9 @@ jobs:
             dep ensure
         fi
 
+    - name: install
+      run: git submodule update --init --recursive
+
     - name: Build
       run: make clean && make -j$(nproc)
 

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "cvm-runtime"]
+	path = cvm-runtime
+	url = https://github.com/CortexFoundation/cvm-runtime.git
+	branch = master

Makefile

@@ -76,6 +76,21 @@ wnode:
 	build/env.sh go run build/ci.go install ./cmd/wnode
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/wnode\" to launch cortex whisper node."
+
+torrent-test:
+	build/env.sh go run build/ci.go install ./cmd/torrent-test
+	@echo "Done building."
+	@echo "Run \"$(GOBIN)/torrent-test\" to launch cortex torrentfs-test."
+
+cvm: plugins/lib_cvm.so
+	build/env.sh go run build/ci.go install ./cmd/cvm
+	@echo "Done building."
+	@echo "Run \"$(GOBIN)/cvm\" to launch cortex vm."
+nodekey:
+	build/env.sh go run build/ci.go install ./cmd/nodekey
+	@echo "Done building."
+	@echo "Run \"$(GOBIN)/nodekey\" to launch nodekey."
+
 plugins/cuda_helper_for_node.so: 
 	$(MAKE) -C $(BASE)/solution cuda
 	build/env.sh go build -buildmode=plugin -o $@ consensus/cuckoo/plugins/cuda/cuda_helper_for_node.go
@@ -84,25 +99,18 @@ plugins/cpu_helper_for_node.so:
 	#$(MAKE) -C $(BASE)/solution cpu-miner
 	#build/env.sh go build -buildmode=plugin -o $@ consensus/cuckoo/plugins/cpu_helper_for_node.go
 
-plugins/cuda_cvm.so:
-	$(MAKE) -C ${INFER_NET_DIR} -j$(nproc) gpu
-	mkdir -p $(BASE)/plugins
-	ln -sf ../cvm-runtime/build/gpu/libcvm_runtime_cuda.so $(BASE)/plugins/cuda_cvm.so
-	# build/env.sh go build -v -tags gpu -buildmode=plugin -o $@ cmd/plugins/c_wrapper.go
-
-plugins/cpu_cvm.so:
-	$(MAKE) -C ${INFER_NET_DIR} -j$(nproc) cpu
-	mkdir -p $(BASE)/plugins
-	ln -sf ../cvm-runtime/build/cpu/libcvm_runtime_cpu.so $(BASE)/plugins/cpu_cvm.so
+plugins/lib_cvm.so:
+	$(MAKE) -C ${INFER_NET_DIR} -j8 lib
+	@mkdir -p plugins
+	ln -sf ../cvm-runtime/build/libcvm_runtime.so $@
 	# build/env.sh go build -v -buildmode=plugin -o $@ cmd/plugins/c_wrapper.go
 	# ln -sf ../../cvm-runtime/kernel inference/synapse/kernel
 
-clib_cpu: plugins/cpu_helper_for_node.so plugins/cpu_cvm.so
-#clib_cpu: plugins/cpu_cvm.so
+clib_cpu: plugins/cpu_helper_for_node.so plugins/lib_cvm.so
 
-clib: plugins/cuda_helper_for_node.so plugins/cpu_helper_for_node.so plugins/cuda_cvm.so plugins/cpu_cvm.so
+clib: plugins/cuda_helper_for_node.so plugins/cpu_helper_for_node.so plugins/lib_cvm.so
 
-clib_mine: plugins/cuda_helper_for_node.so plugins/cpu_helper_for_node.so plugins/cpu_cvm.so
+clib_mine: plugins/cuda_helper_for_node.so plugins/cpu_helper_for_node.so plugins/lib_cvm.so
 
 #inferServer: clib
 #	build/env.sh go run build/ci.go install ./cmd/infer_server

cmd/cortex/cvm_handler.go

@@ -26,7 +26,7 @@ func AvailableHandler(w http.ResponseWriter, inferWork *inference.AvailableWork)
 		return
 	}
 
-	if err := synapse.Engine().Available(inferWork.InfoHash, inferWork.RawSize); err != nil {
+	if err := synapse.Engine().Available(inferWork.InfoHash, inferWork.RawSize, inferWork.CvmNetworkId); err != nil {
 		RespErrorText(w, err)
 	} else {
 		ret_arr := Uint64ToBytes(1)
@@ -43,7 +43,7 @@ func gasHandler(w http.ResponseWriter, inferWork *inference.GasWork) {
 		return
 	}
 
-	ret, err := synapse.Engine().GetGasByInfoHash(inferWork.Model)
+	ret, err := synapse.Engine().GetGasByInfoHash(inferWork.Model, inferWork.CvmNetworkId)
 	if err != nil {
 		log.Warn("Gas calculate Failed", "error", err)
 		RespErrorText(w, err)
@@ -68,7 +68,8 @@ func infoHashHandler(w http.ResponseWriter, inferWork *inference.IHWork) {
 	}
 
 	log.Debug("Infer Task", "Model Hash", inferWork.Model, "Input Hash", inferWork.Input)
-	label, err := synapse.Engine().InferByInfoHash(inferWork.Model, inferWork.Input)
+	label, err := synapse.Engine().InferByInfoHash(
+		inferWork.Model, inferWork.Input, inferWork.CvmVersion, inferWork.CvmNetworkId)
 
 	if err != nil {
 		RespErrorText(w, err)
@@ -101,7 +102,8 @@ func inputContentHandler(w http.ResponseWriter, inferWork *inference.ICWork) {
 	// 	return
 	// }
 
-	label, err := synapse.Engine().InferByInputContent(model, input)
+	label, err := synapse.Engine().InferByInputContent(
+		model, input, inferWork.CvmVersion, inferWork.CvmNetworkId)
 	if err != nil {
 		log.Warn("Infer Failed", "error", err)
 		RespErrorText(w, err)

core/vm/cvm.go

@@ -572,13 +572,14 @@ func (cvm *CVM) DataSync(meta common.Address, dir string, errCh chan error) {
 // infer function that returns an int64 as output, can be used a categorical output
 func (cvm *CVM) Infer(modelInfoHash, inputInfoHash string, modelRawSize, inputRawSize uint64) ([]byte, error) {
 	//log.Info("Inference Information", "Model Hash", modelInfoHash, "Input Hash", inputInfoHash)
+	cvmNetworkId := cvm.chainConfig.ChainID.Int64()
 	if !cvm.vmConfig.DebugInferVM {
-		if err := synapse.Engine().Available(modelInfoHash, int64(modelRawSize)); err != nil {
+		if err := synapse.Engine().Available(modelInfoHash, int64(modelRawSize), cvmNetworkId); err != nil {
 			log.Warn("Infer", "Torrent file model not available, blockchain and torrent not match, modelInfoHash", modelInfoHash, "err", err)
 			return nil, err
 		}
 
-		if err := synapse.Engine().Available(inputInfoHash, int64(inputRawSize)); err != nil {
+		if err := synapse.Engine().Available(inputInfoHash, int64(inputRawSize), cvmNetworkId); err != nil {
 			//log.Warn("File non available", "inputInfoHash:", inputInfoHash, "err", err)
 			return nil, err
 		}
@@ -591,7 +592,9 @@ func (cvm *CVM) Infer(modelInfoHash, inputInfoHash string, modelRawSize, inputRa
 
 	start := mclock.Now()
 
-	inferRes, errRes = synapse.Engine().InferByInfoHash(modelInfoHash, inputInfoHash)
+	cvmVersion := synapse.CVMVersion(cvm.chainConfig, cvm.BlockNumber)
+	inferRes, errRes = synapse.Engine().InferByInfoHash(
+		modelInfoHash, inputInfoHash, cvmVersion, cvmNetworkId)
 	elapsed := time.Duration(mclock.Now()) - time.Duration(start)
 
 	if errRes == nil {
@@ -612,8 +615,9 @@ func (cvm *CVM) InferArray(modelInfoHash string, inputArray []byte, modelRawSize
 	if cvm.vmConfig.DebugInferVM {
 		fmt.Println("Model Hash", modelInfoHash, "number", cvm.BlockNumber, "Input Content", hexutil.Encode(inputArray))
 	}
+	cvmNetworkId := cvm.chainConfig.ChainID.Int64()
 	if !cvm.vmConfig.DebugInferVM {
-		if err := synapse.Engine().Available(modelInfoHash, int64(modelRawSize)); err != nil {
+		if err := synapse.Engine().Available(modelInfoHash, int64(modelRawSize), cvmNetworkId); err != nil {
 			log.Warn("InferArray", "modelInfoHash", modelInfoHash, "not Available", err)
 			return nil, err
 		}
@@ -626,7 +630,9 @@ func (cvm *CVM) InferArray(modelInfoHash string, inputArray []byte, modelRawSize
 
 	start := mclock.Now()
 
-	inferRes, errRes = synapse.Engine().InferByInputContent(modelInfoHash, inputArray)
+	cvmVersion := synapse.CVMVersion(cvm.chainConfig, cvm.BlockNumber)
+	inferRes, errRes = synapse.Engine().InferByInputContent(
+		modelInfoHash, inputArray, cvmVersion, cvmNetworkId)
 	elapsed := time.Duration(mclock.Now()) - time.Duration(start)
 
 	if errRes == nil {
@@ -644,17 +650,18 @@ func (cvm *CVM) OpsInfer(addr common.Address) (opsRes uint64, errRes error) {
 		return 0, err
 	}
 	modelRawSize := modelMeta.RawSize
+	cvmNetworkId := cvm.chainConfig.ChainID.Int64()
 
 	if !cvm.vmConfig.DebugInferVM {
-		if err := synapse.Engine().Available(modelMeta.Hash.Hex(), int64(modelRawSize)); err != nil {
+		if err := synapse.Engine().Available(modelMeta.Hash.Hex(), int64(modelRawSize), cvmNetworkId); err != nil {
 			log.Debug("cvm", "modelMeta", modelMeta, "modelRawSize", modelRawSize, "err", err)
 			return 0, err
 		}
 	}
 
 	start := mclock.Now()
 
-	opsRes, errRes = synapse.Engine().GetGasByInfoHash(modelMeta.Hash.Hex())
+	opsRes, errRes = synapse.Engine().GetGasByInfoHash(modelMeta.Hash.Hex(), cvmNetworkId)
 
 	elapsed := time.Duration(mclock.Now()) - time.Duration(start)