From 3452c4b90cb95b55ccd576548fea94db61839be4 Mon Sep 17 00:00:00 2001 From: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com> Date: Tue, 5 Jan 2021 16:51:56 -0800 Subject: [PATCH] Plotting needs Mo memory (#620) * Increase memory for k32, test black * black wants line hyphen length in pyproject.toml --- .github/workflows/linter.yml | 1 + electron-react/src/constants/plotSizes.ts | 8 ++++---- pyproject.toml | 2 +- src/cmds/plots.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 05655c6259e9..bfaef23fff53 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -51,6 +51,7 @@ jobs: VALIDATE_ALL_CODEBASE: true DEFAULT_BRANCH: master LINTER_RULES_PATH: .github/linters + PYTHON_BLACK_CONFIG_FILE: .python-black VALIDATE_BASH: true VALIDATE_CSS: true VALIDATE_DOCKER: true diff --git a/electron-react/src/constants/plotSizes.ts b/electron-react/src/constants/plotSizes.ts index 05d3635a0676..1fd11ca4dc2e 100644 --- a/electron-react/src/constants/plotSizes.ts +++ b/electron-react/src/constants/plotSizes.ts @@ -9,7 +9,7 @@ export const defaultPlotSize: PlotSize = { label: '101.4GiB', value: 32, workspace: '332GiB', - defaultRam: 4072, + defaultRam: 4608, }; const plotSizes: PlotSize[] = [ @@ -21,10 +21,10 @@ const plotSizes: PlotSize[] = [ { label: '23.8GiB', value: 30, workspace: '83GiB', defaultRam: 1024 }, { label: '49.1GiB', value: 31, workspace: '165GiB', defaultRam: 2036 }, defaultPlotSize, - { label: '208.8GiB', value: 33, workspace: '589GiB', defaultRam: 7168 }, + { label: '208.8GiB', value: 33, workspace: '589GiB', defaultRam: 9216 }, // workspace are guesses using 55.35% - rounded up - past here - { label: '429.8GiB', value: 34, workspace: '1177GiB', defaultRam: 14336 }, - { label: '884.1GiB', value: 35, workspace: '2355GiB', defaultRam: 28672 }, + { label: '429.8GiB', value: 34, workspace: '1177GiB', defaultRam: 18432 }, + { label: '884.1GiB', value: 35, workspace: '2355GiB', defaultRam: 36864 }, ]; export const plotSizeOptions = plotSizes.map((item) => ({ diff --git a/pyproject.toml b/pyproject.toml index 0f2d1792e647..a34b6b5e98c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,4 +6,4 @@ build-backend = "setuptools.build_meta" local_scheme = "no-local-version" [tool.black] -line_length = 120 +line-length = 120 diff --git a/src/cmds/plots.py b/src/cmds/plots.py index e6106d5f81e8..042130de4052 100644 --- a/src/cmds/plots.py +++ b/src/cmds/plots.py @@ -39,7 +39,7 @@ def help_message(): def make_parser(parser): parser.add_argument("-k", "--size", help="Plot size", type=int, default=32) parser.add_argument("-n", "--num", help="Number of plots or challenges", type=int, default=1) - parser.add_argument("-b", "--buffer", help="Mebibytes for sort/plot buffer", type=int, default=4072) + parser.add_argument("-b", "--buffer", help="Mebibytes for sort/plot buffer", type=int, default=4608) parser.add_argument("-r", "--num_threads", help="Number of threads to use", type=int, default=2) parser.add_argument("-u", "--buckets", help="Number of buckets", type=int, default=0) parser.add_argument("-s", "--stripe_size", help="Stripe size", type=int, default=0)