- improved hibench: this benchmark no longer requires a password for cloning hibridon, now (it's actually been the case for more than one year now) that the repository of hibridon is public.

work related to [https://bugzilla.ipr.univ-rennes.fr/show_bug.cgi?id=3958]
This commit is contained in:
Guillaume Raffy 2024-11-19 00:09:32 +01:00
parent 628ac7352a
commit a5b5345d39
3 changed files with 4 additions and 8 deletions

View File

@ -1,7 +1,6 @@
import pandas as pd import pandas as pd
from pathlib import Path from pathlib import Path
import subprocess import subprocess
import os
import shutil import shutil
from ..core import IBenchmark, BenchParam, BenchmarkConfig, BenchmarkMeasurements from ..core import IBenchmark, BenchParam, BenchmarkConfig, BenchmarkMeasurements
from ..util import get_proxy_env_vars from ..util import get_proxy_env_vars
@ -42,8 +41,6 @@ class HiBench(IBenchmark):
def execute(self, config: BenchmarkConfig, benchmark_output_dir: Path) -> BenchmarkMeasurements: def execute(self, config: BenchmarkConfig, benchmark_output_dir: Path) -> BenchmarkMeasurements:
git_repos_url = 'https://github.com/hibridon/hibridon' git_repos_url = 'https://github.com/hibridon/hibridon'
git_user = 'g-raffy' # os.environ['HIBRIDON_REPOS_USER']
git_pass_file = f'{os.getenv("HOME")}/.github/personal_access_tokens/bench.hibridon.cluster.ipr.univ-rennes1.fr.pat'
hibridon_version = config['hibridon_version'] hibridon_version = config['hibridon_version']
test_id = config['test_id'] # eg arch4_quick or nh3h2_qma_long test_id = config['test_id'] # eg arch4_quick or nh3h2_qma_long
compiler_id = config['compiler_id'] compiler_id = config['compiler_id']
@ -57,8 +54,7 @@ class HiBench(IBenchmark):
src_dir = benchmark_output_dir / 'hibridon.git' src_dir = benchmark_output_dir / 'hibridon.git'
output_dir = benchmark_output_dir / 'output' output_dir = benchmark_output_dir / 'output'
password_provider = f'{{"type": "password-file", "password-file-path": "{git_pass_file}"}}' source_tree_provider = f'{{"type": "git-cloner", "repos-url": "{git_repos_url}", "src-dir": "{src_dir}", "code-version": "{hibridon_version}"}}'
source_tree_provider = f'{{"type": "git-cloner", "repos-url": "{git_repos_url}", "src-dir": "{src_dir}", "code-version": "{hibridon_version}", "git-user": "{git_user}", "password-provider": {password_provider}}}'
benchmark_command = f'ctest --output-on-failure -L ^{test_id}$' benchmark_command = f'ctest --output-on-failure -L ^{test_id}$'
cmake_options = [ cmake_options = [

View File

@ -1 +1 @@
__version__ = '0.0.3' __version__ = '0.0.4'

View File

@ -15,8 +15,8 @@ dependencies = [
"sqlalchemy", "sqlalchemy",
# "cocluto >= 1.7", # "cocluto >= 1.7",
"cocluto@git+https://git.ipr.univ-rennes.fr/cellinfo/cocluto@v1.7.0", "cocluto@git+https://git.ipr.univ-rennes.fr/cellinfo/cocluto@v1.7.0",
# "starbench >= 1.0.1" # "starbench >= 1.0.3"
"starbench@git+https://github.com/g-raffy/starbench@v1.0.2", "starbench@git+https://github.com/g-raffy/starbench@v1.0.3",
] ]
requires-python = ">= 3.8" requires-python = ">= 3.8"
authors = [ authors = [