From c99952d8cd5a2f66e0d0559a58fb99a2d494241f Mon Sep 17 00:00:00 2001 From: laser Date: Wed, 1 Apr 2020 14:24:09 -0700 Subject: [PATCH 1/2] shift 2 --- resources.go | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/resources.go b/resources.go index 310373bfe..af31b5233 100644 --- a/resources.go +++ b/resources.go @@ -50,20 +50,20 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 1 << 30, }, abi.RegisteredProof_StackedDRG2KiBSeal: Resources{ - MaxMemory: 1 << 11, - MinMemory: 1 << 11, + MaxMemory: 2 << 10, + MinMemory: 2 << 10, MultiThread: false, - BaseMinMemory: 1 << 11, + BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 1 << 23, - MinMemory: 1 << 23, + MaxMemory: 2 << 22, + MinMemory: 2 << 22, MultiThread: false, - BaseMinMemory: 1 << 23, + BaseMinMemory: 2 << 22, }, }, sealtasks.TTPreCommit1: { @@ -84,20 +84,20 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 1 << 30, }, abi.RegisteredProof_StackedDRG2KiBSeal: Resources{ - MaxMemory: 1 << 11, - MinMemory: 1 << 11, + MaxMemory: 2 << 10, + MinMemory: 2 << 10, MultiThread: false, - BaseMinMemory: 1 << 11, + BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 1 << 23, - MinMemory: 1 << 23, + MaxMemory: 2 << 22, + MinMemory: 2 << 22, MultiThread: false, - BaseMinMemory: 1 << 23, + BaseMinMemory: 2 << 22, }, }, sealtasks.TTPreCommit2: { @@ -118,20 +118,20 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 1 << 30, }, abi.RegisteredProof_StackedDRG2KiBSeal: Resources{ - MaxMemory: 1 << 11, - MinMemory: 1 << 11, + MaxMemory: 2 << 10, + MinMemory: 2 << 10, MultiThread: true, - BaseMinMemory: 1 << 11, + BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 1 << 23, - MinMemory: 1 << 23, + MaxMemory: 2 << 22, + MinMemory: 2 << 22, MultiThread: true, - BaseMinMemory: 1 << 23, + BaseMinMemory: 2 << 22, }, }, sealtasks.TTCommit1: { // Very short (~100ms), so params are very light @@ -152,20 +152,20 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 1 << 30, }, abi.RegisteredProof_StackedDRG2KiBSeal: Resources{ - MaxMemory: 1 << 11, - MinMemory: 1 << 11, + MaxMemory: 2 << 10, + MinMemory: 2 << 10, MultiThread: false, - BaseMinMemory: 1 << 11, + BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 1 << 23, - MinMemory: 1 << 23, + MaxMemory: 2 << 22, + MinMemory: 2 << 22, MultiThread: false, - BaseMinMemory: 1 << 23, + BaseMinMemory: 2 << 22, }, }, sealtasks.TTCommit2: { // TODO: Measure more accurately @@ -188,22 +188,22 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 10 << 30, }, abi.RegisteredProof_StackedDRG2KiBSeal: Resources{ - MaxMemory: 1 << 11, - MinMemory: 1 << 11, + MaxMemory: 2 << 10, + MinMemory: 2 << 10, MultiThread: false, CanGPU: true, - BaseMinMemory: 1 << 11, + BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 1 << 23, - MinMemory: 1 << 23, + MaxMemory: 2 << 22, + MinMemory: 2 << 22, MultiThread: false, CanGPU: true, - BaseMinMemory: 1 << 23, + BaseMinMemory: 2 << 22, }, }, } From 93392329464d857f04681b9faa9736aef1a13167 Mon Sep 17 00:00:00 2001 From: laser Date: Wed, 1 Apr 2020 16:26:47 -0700 Subject: [PATCH 2/2] shift by multiple of 10 --- resources.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/resources.go b/resources.go index af31b5233..db812a28e 100644 --- a/resources.go +++ b/resources.go @@ -58,12 +58,12 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 2 << 22, - MinMemory: 2 << 22, + MaxMemory: 8 << 20, + MinMemory: 8 << 20, MultiThread: false, - BaseMinMemory: 2 << 22, + BaseMinMemory: 8 << 20, }, }, sealtasks.TTPreCommit1: { @@ -92,12 +92,12 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 2 << 22, - MinMemory: 2 << 22, + MaxMemory: 8 << 20, + MinMemory: 8 << 20, MultiThread: false, - BaseMinMemory: 2 << 22, + BaseMinMemory: 8 << 20, }, }, sealtasks.TTPreCommit2: { @@ -126,12 +126,12 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 2 << 22, - MinMemory: 2 << 22, + MaxMemory: 8 << 20, + MinMemory: 8 << 20, MultiThread: true, - BaseMinMemory: 2 << 22, + BaseMinMemory: 8 << 20, }, }, sealtasks.TTCommit1: { // Very short (~100ms), so params are very light @@ -160,12 +160,12 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 2 << 22, - MinMemory: 2 << 22, + MaxMemory: 8 << 20, + MinMemory: 8 << 20, MultiThread: false, - BaseMinMemory: 2 << 22, + BaseMinMemory: 8 << 20, }, }, sealtasks.TTCommit2: { // TODO: Measure more accurately @@ -197,13 +197,13 @@ var ResourceTable = map[sealtasks.TaskType]map[abi.RegisteredProof]Resources{ BaseMinMemory: 2 << 10, }, abi.RegisteredProof_StackedDRG8MiBSeal: Resources{ - MaxMemory: 2 << 22, - MinMemory: 2 << 22, + MaxMemory: 8 << 20, + MinMemory: 8 << 20, MultiThread: false, CanGPU: true, - BaseMinMemory: 2 << 22, + BaseMinMemory: 8 << 20, }, }, }