Reduce dependency of tests on specific AD type.

jblueh · jblueh · commit 8806987e4482 · 2025-10-21T11:02:09.000+02:00
diff --git a/tests/tests/TestParallelCopyin.hpp b/tests/tests/TestParallelCopyin.hpp
@@ -50,13 +50,13 @@ struct TestParallelCopyin : public TestBase<4, 1, 3, TestParallelCopyin<_Case>>
       #ifndef BUILD_REFERENCE
         /* Set activity of default tapes. They might record copy operations due to firstprivate. OpDiLib's AD approach
          * for parallel regions moves these recordings to the correct tapes. */
-        if (T::getTape().isActive()) {
+        if (opdi::tool->isActive(opdi::tool->getThreadLocalTape())) {
           opdi::logic->beginSkippedParallelRegion();
           OPDI_PARALLEL()
           {
             /* due to skipping, OpDiLib has not exchanged the tapes */
             if (omp_get_thread_num() != 0) {
-              T::getTape().setActive();
+              opdi::tool->setActive(opdi::tool->getThreadLocalTape(), true);
             }
           }
           OPDI_END_PARALLEL
diff --git a/tests/tests/TestParallelFirstprivate.hpp b/tests/tests/TestParallelFirstprivate.hpp
@@ -42,13 +42,13 @@ struct TestParallelFirstprivate : public TestBase<4, 1, 3, TestParallelFirstpriv
       #ifndef BUILD_REFERENCE
         /* Set activity of default tapes. They might record copy operations due to firstprivate. OpDiLib's AD approach
          * for parallel regions moves these recordings to the correct tapes. */
-        if (T::getTape().isActive()) {
+        if (opdi::tool->isActive(opdi::tool->getThreadLocalTape())) {
           opdi::logic->beginSkippedParallelRegion();
           OPDI_PARALLEL()
           {
             /* due to skipping, OpDiLib has not exchanged the tapes */
             if (omp_get_thread_num() != 0) {
-              T::getTape().setActive();
+              opdi::tool->setActive(opdi::tool->getThreadLocalTape(), true);
             }
           }
           OPDI_END_PARALLEL

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ struct TestParallelCopyin : public TestBase<4, 1, 3, TestParallelCopyin<_Case>>`
`50`	`50`	`#ifndef BUILD_REFERENCE`
`51`	`51`	`/* Set activity of default tapes. They might record copy operations due to firstprivate. OpDiLib's AD approach`
`52`	`52`	`* for parallel regions moves these recordings to the correct tapes. */`
`53`		`- if (T::getTape().isActive()) {`
	`53`	`+ if (opdi::tool->isActive(opdi::tool->getThreadLocalTape())) {`
`54`	`54`	`opdi::logic->beginSkippedParallelRegion();`
`55`	`55`	`OPDI_PARALLEL()`
`56`	`56`	`{`
`57`	`57`	`/* due to skipping, OpDiLib has not exchanged the tapes */`
`58`	`58`	`if (omp_get_thread_num() != 0) {`
`59`		`- T::getTape().setActive();`
	`59`	`+ opdi::tool->setActive(opdi::tool->getThreadLocalTape(), true);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`OPDI_END_PARALLEL`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,13 @@ struct TestParallelFirstprivate : public TestBase<4, 1, 3, TestParallelFirstpriv`
`42`	`42`	`#ifndef BUILD_REFERENCE`
`43`	`43`	`/* Set activity of default tapes. They might record copy operations due to firstprivate. OpDiLib's AD approach`
`44`	`44`	`* for parallel regions moves these recordings to the correct tapes. */`
`45`		`- if (T::getTape().isActive()) {`
	`45`	`+ if (opdi::tool->isActive(opdi::tool->getThreadLocalTape())) {`
`46`	`46`	`opdi::logic->beginSkippedParallelRegion();`
`47`	`47`	`OPDI_PARALLEL()`
`48`	`48`	`{`
`49`	`49`	`/* due to skipping, OpDiLib has not exchanged the tapes */`
`50`	`50`	`if (omp_get_thread_num() != 0) {`
`51`		`- T::getTape().setActive();`
	`51`	`+ opdi::tool->setActive(opdi::tool->getThreadLocalTape(), true);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`OPDI_END_PARALLEL`