Skip to content

Commit 1e51721

Browse files
committed
Merge remote-tracking branch 'github/develop' into develop
2 parents 87a566e + 039cf08 commit 1e51721

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

documentation/examples/Example_23_OpenMP_Parallel_Codes.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#if CODI_EnableOpDiLib
22
//! [Example 23 - OpenMP Parallel Codes]
33
#include <codi.hpp>
4-
#include <opdi.hpp>
54
#include <iostream>
65

76
#include <opdi/backend/macro/macroBackend.hpp>
@@ -19,6 +18,7 @@ int main(int nargs, char** args) {
1918
opdi::logic = new opdi::OmpLogic;
2019
opdi::logic->init();
2120
opdi::tool = new CoDiOpDiLibTool<Real>;
21+
opdi::tool->init();
2222

2323
// usual AD workflow in the serial parts of the code
2424

@@ -55,14 +55,16 @@ int main(int nargs, char** args) {
5555
y.setGradient(1.0);
5656

5757
opdi::logic->prepareEvaluate(); // prepare OpDiLib for evaluation
58-
5958
tape.evaluate();
59+
opdi::logic->postEvaluate(); // OpDiLib-specific postprocessing
6060

6161
std::cout << "f(" << x << ") = " << y << std::endl;
6262
std::cout << "df/dx(" << x << ") = " << x.getGradient() << std::endl;
6363

6464
// finalize OpDiLib
6565

66+
opdi::tool->finalize();
67+
opdi::logic->finalize();
6668
opdi::backend->finalize();
6769
delete opdi::backend;
6870
delete opdi::logic;

include/codi/tapes/primalValueBaseTape.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,7 @@ namespace codi {
20122012
CODI_INLINE static void evaluateFull(Func const& evalInner, size_t const& maxOutputArgs,
20132013
size_t const& maxActiveArgs, size_t const& maxConstantArgs,
20142014
Real* primalVector, STMT_COMMON_ARGS) {
2015-
CODI_UNUSED(evalInner, maxActiveArgs, maxConstantArgs, numberOfPassiveArguments);
2015+
CODI_UNUSED(evalInner, maxOutputArgs, maxActiveArgs, maxConstantArgs, numberOfPassiveArguments);
20162016

20172017
StatementDataPointers pointers = {};
20182018
pointers.populate(1, size, size, 0, byteData);

0 commit comments

Comments
 (0)