Merge pull request #15 from oneapi-src/quicksilver/fix_sycl_math_calls

[Quicksilver] Used math calls from sycl

Author: Anudeep Kambapu

QuickSilver/SYCL/src/GridAssignmentObject.cc.dp.cpp

@@ -41,7 +41,6 @@ SPDX-License-Identifier: BSD-3-Clause
 
 using std::queue;
 using std::vector;
-using sycl::floor;
 using sycl::max;
 using sycl::min;
 
@@ -88,9 +87,9 @@ GridAssignmentObject::GridAssignmentObject(const vector<MC_Vector> &centers)
 
    double x = _centers.size() / centersPerCell / (lx * ly * lz);
    x = pow(x, 1.0 / 3.0);
-   _nx = max(1., floor(x * lx));
-   _ny = max(1., floor(x * ly));
-   _nz = max(1., floor(x * lz));
+   _nx = max(1., sycl::floor(x * lx));
+   _ny = max(1., sycl::floor(x * ly));
+   _nz = max(1., sycl::floor(x * lz));
    _dx = lx / _nx;
    _dy = ly / _ny;
    _dz = lz / _nz;

QuickSilver/SYCL/src/MonteCarlo.cc.dp.cpp

@@ -59,8 +59,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include "macros.hh" // current location of openMP wrappers.
 #include "cudaUtils.hh"
 
-using sycl::ceil;
-
 //----------------------------------------------------------------------------------------------------------------------
 // Construct a MonteCarlo object.
 //----------------------------------------------------------------------------------------------------------------------
@@ -135,7 +133,7 @@ MonteCarlo::MonteCarlo(const Parameters &params)
     {
         const MaterialParameters &mp = matIter->second;
         double nuBar = params.crossSectionParams.at(mp.fissionCrossSection).nuBar;
-        size_t nb = ceil(nuBar);
+        size_t nb = sycl::ceil(nuBar);
         size_t test_size = nb * (batch_size);
 
         if (test_size > vector_size)

QuickSilver/SYCL/src/NuclearData.hh

@@ -59,7 +59,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include "EnergySpectrum.hh"
 
 using std::pow;
-using sycl::log10;
 
 #if defined(HAVE_SYCL)
 extern sycl::queue sycl_device_queue; // global variable for device queue
@@ -111,7 +110,7 @@ public:
       for (int ii = 0; ii < nGroups; ++ii)
       {
          double energy = (energies[ii] + energies[ii + 1]) / 2.0;
-         _crossSection[ii] = sycl::pow<double>(10, polynomial(log10(energy)));
+         _crossSection[ii] = sycl::pow(10.0, (double)polynomial(sycl::log10(energy)));
       }
 
       // Find the normalization value for the polynomial.  This is the
@@ -398,7 +397,7 @@ public:
       for (int ii = 0; ii < nGroups; ++ii)
       {
          double energy = (energies[ii] + energies[ii + 1]) / 2.0;
-         _crossSection[ii] = sycl::pow<double>(10, polynomial(log10(energy)));
+         _crossSection[ii] = sycl::pow(10.0, (double)polynomial(sycl::log10(energy)));
       }
 
       // Find the normalization value for the polynomial.  This is the