Skip to content

Commit f856ceb

Browse files
committed
Use GridKit::Testing::isEqual in Enzyme examples.
1 parent aa9e7d6 commit f856ceb

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
add_executable(EnzymeLibScalarCheck EnzymeScalar.cpp ScalarModel.cpp)
2-
target_link_libraries(EnzymeLibScalarCheck ClangEnzymeFlags)
2+
target_link_libraries(EnzymeLibScalarCheck ClangEnzymeFlags GRIDKIT::Utilities)
33

44
add_test(NAME "EnzymeLibScalarCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeLibScalarCheck)

examples/Enzyme/Library/Scalar/EnzymeScalar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <iostream>
2-
#include <limits>
32

43
#include "ScalarModel.hpp"
4+
#include <Utilities/Testing.hpp>
55

66
/**
77
* @brief Example that computes the derivative of a library function
@@ -23,7 +23,7 @@ int main()
2323
double dsq = scalar_model.getDerivativeValue();
2424

2525
std::cout << "x = " << var << ", x^2 = " << sq << ", d(x^2)/dx = " << dsq << "\n";
26-
if (std::abs(dsq - 2.0 * var) > std::numeric_limits<double>::epsilon())
26+
if (!GridKit::Testing::isEqual(dsq, 2.0 * var))
2727
{
2828
fail++;
2929
std::cout << "Result incorrect\n";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
add_executable(EnzymeLibVectorCheck EnzymeVector.cpp VectorModel.cpp)
2-
target_link_libraries(EnzymeLibVectorCheck ClangEnzymeFlags GRIDKIT::DenseMatrix)
2+
target_link_libraries(EnzymeLibVectorCheck ClangEnzymeFlags GRIDKIT::DenseMatrix GRIDKIT::Utilities)
33

44
add_test(NAME "EnzymeLibVectorCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeLibVectorCheck)

examples/Enzyme/Library/Vector/EnzymeVector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <iostream>
2-
#include <limits>
32

43
#include "VectorModel.hpp"
4+
#include <Utilities/Testing.hpp>
55

66
/**
77
* @brief Example that computes the Jacobian of a vector-valued residual
@@ -63,7 +63,7 @@ int main()
6363
{
6464
for (size_t idx = 0; idx < var.size(); ++idx)
6565
{
66-
if (std::abs(jac.getValue(idx, idy) - jac_ref.getValue(idx, idy)) > std::numeric_limits<double>::epsilon())
66+
if (!GridKit::Testing::isEqual(jac.getValue(idx, idy), jac_ref.getValue(idx, idy)))
6767
{
6868
fail++;
6969
if (verbose)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_executable(EnzymePowerElectronicsCheck main.cpp)
22
target_compile_options(EnzymePowerElectronicsCheck PUBLIC -fno-vectorize -ffast-math -fno-unroll-loops)
3-
target_link_libraries(EnzymePowerElectronicsCheck ClangEnzymeFlags GRIDKIT::DenseMatrix GRIDKIT::power_elec_disgen)
3+
target_link_libraries(EnzymePowerElectronicsCheck ClangEnzymeFlags GRIDKIT::DenseMatrix GRIDKIT::power_elec_disgen GRIDKIT::Utilities)
44

55
add_test(NAME "EnzymePowerElectronicsCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymePowerElectronicsCheck)

examples/Enzyme/PowerElectronics/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <iostream>
2-
#include <limits>
32

43
#include <LinearAlgebra/DenseMatrix/DenseMatrix.hpp>
54
#include <Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
65
#include <Model/PowerElectronics/SystemModelPowerElectronics.hpp>
6+
#include <Utilities/Testing.hpp>
77

88
/**
99
* @brief Standalone example that computes the Jacobian associated with the
@@ -177,7 +177,7 @@ int main()
177177
{
178178
double jac_value = jac_autodiff.getValue(idx, idy);
179179
double jac_ref_value = jac_ref_dense.getValue(idx, idy);
180-
if (std::abs(jac_value - jac_ref_value) > 10 * std::numeric_limits<double>::epsilon())
180+
if (!GridKit::Testing::isEqual(jac_value, jac_ref_value))
181181
{
182182
fail++;
183183
if (verbose)

examples/Enzyme/Standalone/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
add_executable(EnzymeStandaloneScalarCheck EnzymeScalar.cpp)
2-
target_link_libraries(EnzymeStandaloneScalarCheck ClangEnzymeFlags)
2+
target_link_libraries(EnzymeStandaloneScalarCheck ClangEnzymeFlags GRIDKIT::Utilities)
33

44
add_executable(EnzymeStandaloneVectorCheck EnzymeVector.cpp)
5-
target_link_libraries(EnzymeStandaloneVectorCheck ClangEnzymeFlags GRIDKIT::DenseMatrix)
5+
target_link_libraries(EnzymeStandaloneVectorCheck ClangEnzymeFlags GRIDKIT::DenseMatrix GRIDKIT::Utilities)
66

77
add_executable(EnzymeStandaloneSparseCheck EnzymeSparse.cpp)
88
target_compile_options(EnzymeStandaloneSparseCheck PUBLIC -mllvm -enzyme-auto-sparsity=1)
9-
target_link_libraries(EnzymeStandaloneSparseCheck ClangEnzymeFlags GRIDKIT::SparseMatrix)
9+
target_link_libraries(EnzymeStandaloneSparseCheck ClangEnzymeFlags GRIDKIT::SparseMatrix GRIDKIT::Utilities)
1010

1111
add_test(NAME "EnzymeStandaloneScalarCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneScalarCheck)
1212
add_test(NAME "EnzymeStandaloneVectorCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneVectorCheck)

examples/Enzyme/Standalone/EnzymeScalar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <iostream>
2-
#include <limits>
2+
#include <Utilities/Testing.hpp>
33

44
/**
55
* @brief Standalone example that computes the derivative of a scalar function
@@ -27,7 +27,7 @@ int main()
2727
double sq = square(var);
2828
double dsq = dsquare(var);
2929
std::cout << "x = " << var << ", x^2 = " << sq << ", d(x^2)/dx = " << dsq << "\n";
30-
if (std::abs(dsq - 2.0 * var) > std::numeric_limits<double>::epsilon())
30+
if (!GridKit::Testing::isEqual(dsq, 2.0 * var))
3131
{
3232
fail++;
3333
std::cout << "Result incorrect\n";

examples/Enzyme/Standalone/EnzymeSparse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include <assert.h>
22
#include <cmath>
3-
#include <limits>
43
#include <stdio.h>
54
#include <vector>
65

76
#include <LinearAlgebra/SparseMatrix/COO_Matrix.hpp>
7+
#include <Utilities/Testing.hpp>
88

99
/**
1010
* @brief Standalone example that computes the sparse Jacobian of a vector-valued function
@@ -165,7 +165,7 @@ void check(SparseMatrix matrix_1, SparseMatrix matrix_2, int& fail)
165165
fail++;
166166
if (ccord_1[ind] != ccord_2[ind])
167167
fail++;
168-
if (std::abs(vals_1[ind] - vals_2[ind]) > std::numeric_limits<double>::epsilon())
168+
if (!GridKit::Testing::isEqual(vals_1[ind], vals_2[ind]))
169169
fail++;
170170
}
171171
}

examples/Enzyme/Standalone/EnzymeVector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <iostream>
2-
#include <limits>
32
#include <vector>
43

54
#include <LinearAlgebra/DenseMatrix/DenseMatrix.hpp>
5+
#include <Utilities/Testing.hpp>
66

77
/**
88
* @brief Standalone example that computes the Jacobian of a vector-valued function
@@ -110,7 +110,7 @@ int main()
110110
{
111111
for (size_t idx = 0; idx < x.size(); ++idx)
112112
{
113-
if (std::abs(dsq.getValue(idx, idy) - dsq_ref.getValue(idx, idy)) > std::numeric_limits<double>::epsilon())
113+
if (!GridKit::Testing::isEqual(dsq.getValue(idx, idy), dsq_ref.getValue(idx, idy)))
114114
{
115115
fail++;
116116
if (verbose)

0 commit comments

Comments
 (0)