update alpaka-job-matrix-library to 1.3.5

- The patch fixes several bugs in the filter, when nvcc is the device compiler: alpaka-group/alpaka-job-matrix-library#18
- Implement simple verification rule.

.gitlab-ci.yml

@@ -26,7 +26,8 @@ generate:
  script:
  - apk update && apk add python3~=3.11 py3-pip
  - pip3 install -r script/job_generator/requirements.txt
- - python3 script/job_generator/job_generator.py ${ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION} --compile-only -o compile_only.yml
+ # it's enough to verify one time, because --compile-only und --runtime-only generates the same job matrix and filter it
+ - python3 script/job_generator/job_generator.py ${ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION} --verify --compile-only -o compile_only.yml
  - python3 script/job_generator/job_generator.py ${ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION} --runtime-only -o runtime.yml
  - cat compile_only.yml
  - cat runtime.yml

script/job_generator/requirements.txt

@@ -1,4 +1,4 @@
-alpaka-job-coverage == 1.3.1
+alpaka-job-coverage == 1.3.5
 allpairspy == 2.5.0
 typeguard < 3.0.0
 pyaml

script/job_generator/verify.py

@@ -12,6 +12,55 @@
 import versions
 
 
+class Combination:
+ def __init__(self, parameters: Dict[str, Tuple[str, str]]):
+ """A combination describes a (sub-)set of parameters and has a state
+ found (default false). If all parameters defined in the combination are
+ contained in a row, the found state is changed to true.
+
+ Args:
+ parameters (Dict[str, Tuple[str, str]]): Set of parameter which
+ should be found
+ """
+ self.parameters = parameters
+ self.found = False
+
+ def match_row(self, row: Dict[str, Tuple[str, str]]) -> bool:
+ """Check if all parameters are contained in the row. If all parameters
+ are found, change internal found state to True.
+
+ Args:
+ row (Dict[str, Tuple[str, str]]): The row
+
+ Returns:
+ bool: Return True, if all parameters was found.
+ """
+ for param_name, name_version in self.parameters.items():
+ name, version = name_version
+ # use * as wildcard and test only the name
+ if version == "*":
+ if row[param_name][0] != name:
+ return False
+ else:
+ if row[param_name] != name_version:
+ return False
+
+ self.found = True
+ return True
+
+ def __str__(self) -> str:
+ s = ""
+ if self.found:
+ s += "\033[32mfound: "
+ else:
+ s += "\033[31mnot found: "
+
+ s += str(self.parameters)
+
+ s += "\033[m"
+ return s
+
+
 @typechecked
 def verify(combinations: List[Dict[str, Tuple[str, str]]]) -> bool:
  """Check if job matrix fullfill certain requirements.
@@ -22,8 +71,41 @@ def verify(combinations: List[Dict[str, Tuple[str, str]]]) -> bool:
  bool: True if all checks passes, otherwise False.
  """
 
- # print("\033[31mverification failed\033[m")
- print("\033[33mWARNING: no verification tests implemented\033[m")
- # print("\033[32mverification was fine\033[m")
+ #############################################################
+ # check if the combinations are created
+ #############################################################
+ combinations_to_search = [
+ # use * as wildcard for the version and test if the compiler
+ # combinations exists
+ Combination({HOST_COMPILER: (GCC, "*"), DEVICE_COMPILER: (NVCC, "*")}),
+ Combination({HOST_COMPILER: (CLANG, "*"), DEVICE_COMPILER: (NVCC, "*")}),
+ Combination({HOST_COMPILER: (HIPCC, "*"), DEVICE_COMPILER: (HIPCC, "*")}),
+ Combination(
+ {HOST_COMPILER: (CLANG_CUDA, "*"), DEVICE_COMPILER: (CLANG_CUDA, "*")}
+ ),
+ Combination(
+ {DEVICE_COMPILER: (NVCC, "12.0"), CXX_STANDARD: (CXX_STANDARD, "20")}
+ ),
+ Combination(
+ {DEVICE_COMPILER: (NVCC, "12.1"), CXX_STANDARD: (CXX_STANDARD, "20")}
+ ),
+ ]
+
+ for cs in combinations_to_search:
+ for row in combinations:
+ if cs.match_row(row):
+ break
+
+ missing_combination = False
+
+ for cs in combinations_to_search:
+ if not cs.found:
+ print(cs)
+ missing_combination = True
+
+ if missing_combination:
+ print("\033[31mverification failed\033[m")
+ return False
 
+ print("\033[32mverification passed\033[m")
  return True