Commit f3a69b25 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Merge branch 'ci_runners' into 'main' 

Attempt to fix a CI test failure by removing std:: from erf in special...

See merge request !89
parents 36f47f43 0350c63d

graph_framework.xcodeproj/project.pbxproj

+6 −0
Original line number Diff line number Diff line
@@ -1941,6 +1941,7 @@ 
					"-lLLVMCGData",

					"-lLLVMSandboxIR",

					"-lLLVMObjectYAML",

					"-lLLVMPlugins",

					"-lLLVMFrontendAtomic",

					"-lclangFrontend",

					"-lclangBasic",
@@ -1950,11 +1951,13 @@ 
					"-lclangSerialization",

					"-lclangAST",

					"-lclangSema",

					"-lclangAnalysisLifetimeSafety",

					"-lclangAnalysis",

					"-lclangASTMatchers",

					"-lclangSupport",

					"-lclangParse",

					"-lclangAPINotes",

					"-lclangOptions",

					"-lclangCodeGen",

					"-rpath",

					/usr/local/lib,
@@ -2111,6 +2114,7 @@ 
					"-lLLVMCGData",

					"-lLLVMSandboxIR",

					"-lLLVMObjectYAML",

					"-lLLVMPlugins",

					"-lLLVMFrontendAtomic",

					"-lclangFrontend",

					"-lclangBasic",
@@ -2120,11 +2124,13 @@ 
					"-lclangSerialization",

					"-lclangAST",

					"-lclangSema",

					"-lclangAnalysisLifetimeSafety",

					"-lclangAnalysis",

					"-lclangASTMatchers",

					"-lclangSupport",

					"-lclangParse",

					"-lclangAPINotes",

					"-lclangOptions",

					"-lclangCodeGen",

					"-rpath",

					/usr/local/lib,

graph_framework/special_functions.hpp

+0 −4
Original line number Diff line number Diff line
@@ -1505,11 +1505,7 @@ namespace special { 
        T y = imag(z);



        if (y == static_cast<T> (0)) {

#ifdef CUDA_DEVICE_CODE

            return complex_type<T> (erf(x), y);

#else

            return complex_type<T> (std::erf(x), y);

#endif

        } else if (x == static_cast<T> (0)) {

            const T y2 = sq(y);

            return complex_type<T> (x, y2 > static_cast<T> (720) ? (y > static_cast<T> (0) ?  numeric_limits<T>::max() :

graph_tests/jit_test.cpp

+22 −0
Original line number Diff line number Diff line
@@ -322,6 +322,28 @@ template<jit::float_scalar T> void run_math_tests() { 
                 graph::variable_cast(v4)},

                {pow_non_int}, {},

                pow_non_int->evaluate().at(0), 3.0E-8);



    if constexpr (jit::use_gpu<T> ()) {

        result = 9.0E-8;

    } else {

        result = 0.0;

    }



    auto sin_node = graph::sin(v1);

    compile<T> ({graph::variable_cast(v1)},

                {sin_node}, {},

                sin_node->evaluate().at(0), 0.0);



    auto cos_node = graph::cos(v1);

    compile<T> ({graph::variable_cast(v1)},

                {cos_node}, {},

                cos_node->evaluate().at(0), result);



    auto atan_node = graph::atan(v1, v2);

    compile<T> ({

        graph::variable_cast(v1),

        graph::variable_cast(v2)

    }, {atan_node}, {}, atan_node->evaluate().at(0), result);

}



//------------------------------------------------------------------------------