add infer uri flag

CortexFoundation · Jun 5, 2018 · 928e360 · 928e360
1 parent dc59560
commit 928e360
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -119,6 +119,7 @@ var (
 		utils.GpoPercentileFlag,
 		utils.ExtraDataFlag,
 		configFileFlag,
+		utils.ModelCallInterfaceFlag,
 	}
 
 	rpcFlags = []cli.Flag{

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -532,6 +532,11 @@ var (
 		Usage: "Minimum POW accepted",
 		Value: whisper.DefaultMinimumPoW,
 	}
+	ModelCallInterfaceFlag = cli.StringFlag{
+		Name:  "cvm.inferuri",
+		Usage: "infer uri",
+		Value: "http://127.0.0.1:5000/infer",
+	}
 )
 
 // MakeDataDir retrieves the currently requested data directory, terminating
@@ -1247,7 +1252,10 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
 	if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheGCFlag.Name) {
 		cache.TrieNodeLimit = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheGCFlag.Name) / 100
 	}
-	vmcfg := vm.Config{EnablePreimageRecording: ctx.GlobalBool(VMEnableDebugFlag.Name)}
+	vmcfg := vm.Config{
+		EnablePreimageRecording: ctx.GlobalBool(VMEnableDebugFlag.Name),
+		InferURI:                ctx.GlobalString(ModelCallInterfaceFlag.Name),
+	}
 	chain, err = core.NewBlockChain(chainDb, cache, config, engine, vmcfg)
 	if err != nil {
 		Fatalf("Can't create BlockChain: %v", err)

diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -428,7 +428,7 @@ func (evm *EVM) Infer(model_meta_hash []byte, input_meta_hash []byte) ([]byte, e
 	resp, err := resty.R().
 		SetHeader("Content-Type", "application/json").
 		SetBody(requestBody).
-		Post("http://127.0.0.1:5000/infer")
+		Post(evm.interpreter.cfg.InferURI)
 	if err != nil {
 		return []byte{}, errors.New("evm.Infer: External Call Error")
 	}

diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -40,6 +40,8 @@ type Config struct {
 	// may be left uninitialised and will be set to the default
 	// table.
 	JumpTable [256]operation
+	// uri for remote infer service
+	InferURI string
 }
 
 // Interpreter is used to run Ethereum based contracts and will utilise the
@@ -73,7 +75,6 @@ func NewInterpreter(evm *EVM, cfg Config) *Interpreter {
 			cfg.JumpTable = frontierInstructionSet
 		}
 	}
-
 	return &Interpreter{
 		evm:      evm,
 		cfg:      cfg,

diff --git a/core/vm/runtime/runner_test.go b/core/vm/runtime/runner_test.go
@@ -79,8 +79,9 @@ func TestRunCmd(t *testing.T) {
 		Value:       new(big.Int),
 		BlockNumber: new(big.Int).SetUint64(blockNumber),
 		EVMConfig: vm.Config{
-			Tracer: tracer,
-			Debug:  true,
+			Tracer:   tracer,
+			Debug:    true,
+			InferURI: "http://127.0.0.1:5000/infer",
 		},
 	}