Default (nonces, threads) = (288, CPU*3/4) for Mainnet (#4741)

Co-authored-by: kimmy lin <30611210+countvonzero@users.noreply.github.com>
spacemeshos · Jul 22, 2023 · 2dcfb7a · 2dcfb7a
1 parent 0bd65e1
commit 2dcfb7a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/config/mainnet.go b/config/mainnet.go
@@ -5,6 +5,7 @@ import (
 	"math/big"
 	"os"
 	"path/filepath"
+	"runtime"
 	"time"
 
 	"github.com/spacemeshos/go-spacemesh/activation"
@@ -27,6 +28,14 @@ func MainnetConfig() Config {
 		panic(err)
 	}
 	p2pconfig := p2p.DefaultConfig()
+
+	smeshing := DefaultSmeshingConfig()
+	smeshing.ProvingOpts.Nonces = 288
+	smeshing.ProvingOpts.Threads = uint(runtime.NumCPU() * 3 / 4)
+	if smeshing.ProvingOpts.Threads < 1 {
+		smeshing.ProvingOpts.Threads = 1
+	}
+
 	return Config{
 		BaseConfig: BaseConfig{
 			DataDirParent:       defaultDataDir,
@@ -115,7 +124,7 @@ func MainnetConfig() Config {
 		P2P:      p2pconfig,
 		API:      grpcserver.DefaultConfig(),
 		TIME:     timeConfig.DefaultConfig(),
-		SMESHING: DefaultSmeshingConfig(),
+		SMESHING: smeshing,
 		FETCH:    fetch.DefaultConfig(),
 		LOGGING:  defaultLoggingConfig(),
 		Sync:     syncer.DefaultConfig(),

diff --git a/config/presets/fastnet.go b/config/presets/fastnet.go
@@ -61,6 +61,8 @@ func fastnet() config.Config {
 	conf.SMESHING.Opts.Throttle = true
 	// Override proof of work flags to use light mode (less memory intensive)
 	conf.SMESHING.ProvingOpts.Flags = postCfg.RecommendedPowFlags()
+	conf.SMESHING.ProvingOpts.Nonces = 16
+	conf.SMESHING.ProvingOpts.Threads = 1
 
 	conf.Beacon.Kappa = 40
 	conf.Beacon.Theta = big.NewRat(1, 4)