[Libreoffice-commits] core.git: 5 commits - formula/source include/formula sc/inc sc/qa sc/source
Kohei Yoshida
kohei.yoshida at collabora.com
Fri Oct 3 12:32:34 PDT 2014
formula/source/core/api/vectortoken.cxx | 39 ++
include/formula/vectortoken.hxx | 16 -
sc/inc/formulagroup.hxx | 2
sc/inc/platforminfo.hxx | 10
sc/qa/unit/opencl-test.cxx | 472 +++++++++++++++----------------
sc/source/core/opencl/formulagroupcl.cxx | 50 +--
sc/source/core/opencl/opbase.cxx | 393 +++++++++++++++----------
sc/source/core/opencl/opbase.hxx | 207 ++++---------
sc/source/core/opencl/openclwrapper.cxx | 74 ++--
sc/source/core/opencl/openclwrapper.hxx | 16 -
sc/source/core/tool/formulagroup.cxx | 20 -
sc/source/core/tool/platforminfo.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 18 -
sc/source/ui/optdlg/calcoptionsdlg.hxx | 6
sc/source/ui/unoobj/docuno.cxx | 6
15 files changed, 700 insertions(+), 633 deletions(-)
New commits:
commit 27ebfb10e9fba1af3bfee86973a349168bd041b1
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Oct 3 15:16:06 2014 -0400
Let's consistently spell OpenCL as 'OpenCL'.
Change-Id: I8bdcf0667b326b77d11001efeeefd5247987ebdc
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index a063cdf..1ee0249 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -120,7 +120,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
public:
static FormulaGroupInterpreter *getStatic();
- static void fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms);
+ static void fillOpenCLInfo(std::vector<OpenCLPlatformInfo>& rPlatforms);
static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation = false);
static void enableOpenCL(bool bEnable);
static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId);
diff --git a/sc/inc/platforminfo.hxx b/sc/inc/platforminfo.hxx
index 2c2e831..c7bb377 100644
--- a/sc/inc/platforminfo.hxx
+++ b/sc/inc/platforminfo.hxx
@@ -18,7 +18,7 @@
namespace sc {
-struct SC_DLLPUBLIC OpenclDeviceInfo
+struct SC_DLLPUBLIC OpenCLDeviceInfo
{
void* device;
OUString maName;
@@ -28,17 +28,17 @@ struct SC_DLLPUBLIC OpenclDeviceInfo
size_t mnComputeUnits;
size_t mnFrequency;
- OpenclDeviceInfo();
+ OpenCLDeviceInfo();
};
-struct SC_DLLPUBLIC OpenclPlatformInfo
+struct SC_DLLPUBLIC OpenCLPlatformInfo
{
void* platform;
OUString maVendor;
OUString maName;
- std::vector<OpenclDeviceInfo> maDevices;
+ std::vector<OpenCLDeviceInfo> maDevices;
- OpenclPlatformInfo();
+ OpenCLPlatformInfo();
};
}
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index c23aa38..aab8fda 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -40,12 +40,12 @@ using namespace ::com::sun::star::uno;
/* Implementation of Filters test */
-class ScOpenclTest
+class ScOpenCLTest
: public test::FiltersTest
, public ScBootstrapFixture
{
public:
- ScOpenclTest();
+ ScOpenCLTest();
/**
* Try to auto-detect OpenCL device if one is available.
@@ -294,7 +294,7 @@ public:
void testStatisticalFormulaStDevA1();
void testStatisticalFormulaStDevPA1();
void testFinancialMDurationFormula1();
- CPPUNIT_TEST_SUITE(ScOpenclTest);
+ CPPUNIT_TEST_SUITE(ScOpenCLTest);
CPPUNIT_TEST(testSharedFormulaXLS);
CPPUNIT_TEST(testFinacialFormula);
CPPUNIT_TEST(testStatisticalFormulaFisher);
@@ -526,7 +526,7 @@ private:
uno::Reference<uno::XInterface> m_xCalcComponent;
};
-bool ScOpenclTest::load(const OUString &rFilter, const OUString &rURL,
+bool ScOpenCLTest::load(const OUString &rFilter, const OUString &rURL,
const OUString &rUserData, unsigned int nFilterFlags,
unsigned int nClipboardID, unsigned int nFilterVersion)
{
@@ -539,18 +539,18 @@ bool ScOpenclTest::load(const OUString &rFilter, const OUString &rURL,
return bLoaded;
}
-bool ScOpenclTest::detectOpenCLDevice()
+bool ScOpenCLTest::detectOpenCLDevice()
{
sc::FormulaGroupInterpreter::enableOpenCL(true);
return sc::FormulaGroupInterpreter::switchOpenCLDevice(OUString(),true);
}
-void ScOpenclTest::enableOpenCL()
+void ScOpenCLTest::enableOpenCL()
{
sc::FormulaGroupInterpreter::enableOpenCL(true);
}
-void ScOpenclTest::testCompilerHorizontal()
+void ScOpenCLTest::testCompilerHorizontal()
{
if (!detectOpenCLDevice())
return;
@@ -578,7 +578,7 @@ void ScOpenclTest::testCompilerHorizontal()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testCompilerNested()
+void ScOpenCLTest::testCompilerNested()
{
if (!detectOpenCLDevice())
return;
@@ -601,7 +601,7 @@ void ScOpenclTest::testCompilerNested()
xDocShRes->DoClose();
}
-void ScOpenclTest::testCompilerString()
+void ScOpenCLTest::testCompilerString()
{
if (!detectOpenCLDevice())
return;
@@ -630,7 +630,7 @@ void ScOpenclTest::testCompilerString()
xDocShRes->DoClose();
}
-void ScOpenclTest::testCompilerInEq()
+void ScOpenCLTest::testCompilerInEq()
{
if (!detectOpenCLDevice())
return;
@@ -656,7 +656,7 @@ void ScOpenclTest::testCompilerInEq()
}
#if 0
-void ScOpenclTest::testSharedFormulaXLSStockHistory()
+void ScOpenCLTest::testSharedFormulaXLSStockHistory()
{
if (!detectOpenCLDevice())
return;
@@ -686,7 +686,7 @@ void ScOpenclTest::testSharedFormulaXLSStockHistory()
xDocShRes->DoClose();
}
-void ScOpenclTest::testSharedFormulaXLSGroundWater()
+void ScOpenCLTest::testSharedFormulaXLSGroundWater()
{
if (!detectOpenCLDevice())
return;
@@ -709,7 +709,7 @@ void ScOpenclTest::testSharedFormulaXLSGroundWater()
}
#endif
-void ScOpenclTest::testSharedFormulaXLS()
+void ScOpenCLTest::testSharedFormulaXLS()
{
if (!detectOpenCLDevice())
return;
@@ -810,7 +810,7 @@ void ScOpenclTest::testSharedFormulaXLS()
xDocShRes->DoClose();
}
//[AMLOEXT-76]
-void ScOpenclTest::testMathFormulaCos()
+void ScOpenCLTest::testMathFormulaCos()
{
if (!detectOpenCLDevice())
return;
@@ -831,7 +831,7 @@ void ScOpenclTest::testMathFormulaCos()
xDocShRes->DoClose();
}
//[AMLOEXT-116]
-void ScOpenclTest::testMathFormulaSinh()
+void ScOpenCLTest::testMathFormulaSinh()
{
if (!detectOpenCLDevice())
return;
@@ -852,7 +852,7 @@ void ScOpenclTest::testMathFormulaSinh()
xDocShRes->DoClose();
}
//[AMLOEXT-196]
-void ScOpenclTest::testMathFormulaPi()
+void ScOpenCLTest::testMathFormulaPi()
{
if (!detectOpenCLDevice())
return;
@@ -873,7 +873,7 @@ void ScOpenclTest::testMathFormulaPi()
xDocShRes->DoClose();
}
//[AMLOEXT-197]
-void ScOpenclTest::testMathFormulaRandom()
+void ScOpenCLTest::testMathFormulaRandom()
{
if (!detectOpenCLDevice())
return;
@@ -896,7 +896,7 @@ void ScOpenclTest::testMathFormulaRandom()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialFormula()
+void ScOpenCLTest::testFinacialFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1053,7 +1053,7 @@ void ScOpenclTest::testFinacialFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-20]
-void ScOpenclTest::testStatisticalFormulaCorrel()
+void ScOpenCLTest::testStatisticalFormulaCorrel()
{
if (!detectOpenCLDevice())
return;
@@ -1078,7 +1078,7 @@ void ScOpenclTest::testStatisticalFormulaCorrel()
xDocShRes->DoClose();
}
-void ScOpenclTest::testStatisticalFormulaFisher()
+void ScOpenCLTest::testStatisticalFormulaFisher()
{
if (!detectOpenCLDevice())
return;
@@ -1101,7 +1101,7 @@ void ScOpenclTest::testStatisticalFormulaFisher()
xDocShRes->DoClose();
}
//[AMLOEXT-44]
-void ScOpenclTest::testStatisticalFormulaFisherInv()
+void ScOpenCLTest::testStatisticalFormulaFisherInv()
{
if (!detectOpenCLDevice())
return;
@@ -1124,7 +1124,7 @@ void ScOpenclTest::testStatisticalFormulaFisherInv()
xDocShRes->DoClose();
}
//[AMLOEXT-45]
-void ScOpenclTest::testStatisticalFormulaGamma()
+void ScOpenCLTest::testStatisticalFormulaGamma()
{
if (!detectOpenCLDevice())
return;
@@ -1147,7 +1147,7 @@ void ScOpenclTest::testStatisticalFormulaGamma()
xDocShRes->DoClose();
}
//[AMLOEXT-46]
-void ScOpenclTest::testFinacialFvscheduleFormula()
+void ScOpenCLTest::testFinacialFvscheduleFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1167,7 +1167,7 @@ void ScOpenclTest::testFinacialFvscheduleFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-47]
-void ScOpenclTest::testMathFormulaAbs()
+void ScOpenCLTest::testMathFormulaAbs()
{
if (!detectOpenCLDevice())
return;
@@ -1189,7 +1189,7 @@ void ScOpenclTest::testMathFormulaAbs()
xDocShRes->DoClose();
}
//[AMLOEXT-69]
-void ScOpenclTest::testFinacialSYDFormula()
+void ScOpenCLTest::testFinacialSYDFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1209,7 +1209,7 @@ void ScOpenclTest::testFinacialSYDFormula()
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialIRRFormula()
+void ScOpenCLTest::testFinacialIRRFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1229,7 +1229,7 @@ void ScOpenclTest::testFinacialIRRFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-49]
-void ScOpenclTest::testStatisticalFormulaGammaLn()
+void ScOpenCLTest::testStatisticalFormulaGammaLn()
{
if (!detectOpenCLDevice())
return;
@@ -1251,7 +1251,7 @@ void ScOpenclTest::testStatisticalFormulaGammaLn()
xDocShRes->DoClose();
}
//[AMLOEXT-50]
-void ScOpenclTest::testStatisticalFormulaGauss()
+void ScOpenCLTest::testStatisticalFormulaGauss()
{
if (!detectOpenCLDevice())
return;
@@ -1272,7 +1272,7 @@ void ScOpenclTest::testStatisticalFormulaGauss()
xDocShRes->DoClose();
}
//[AMLOEXT-52]
-void ScOpenclTest::testStatisticalFormulaGeoMean()
+void ScOpenCLTest::testStatisticalFormulaGeoMean()
{
if (!detectOpenCLDevice())
return;
@@ -1294,7 +1294,7 @@ void ScOpenclTest::testStatisticalFormulaGeoMean()
xDocShRes->DoClose();
}
//[AMLOEXT-51]
-void ScOpenclTest::testStatisticalFormulaHarMean()
+void ScOpenCLTest::testStatisticalFormulaHarMean()
{
if (!detectOpenCLDevice())
return;
@@ -1316,7 +1316,7 @@ void ScOpenclTest::testStatisticalFormulaHarMean()
xDocShRes->DoClose();
}
//[AMLOEXT-53]
-void ScOpenclTest::testFinacialSLNFormula()
+void ScOpenCLTest::testFinacialSLNFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1336,7 +1336,7 @@ void ScOpenclTest::testFinacialSLNFormula()
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialMIRRFormula()
+void ScOpenCLTest::testFinacialMIRRFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1357,7 +1357,7 @@ void ScOpenclTest::testFinacialMIRRFormula()
}
// [AMLOEXT-55]
-void ScOpenclTest::testFinancialCoupdaybsFormula()
+void ScOpenCLTest::testFinancialCoupdaybsFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1377,7 +1377,7 @@ void ScOpenclTest::testFinancialCoupdaybsFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-56]
-void ScOpenclTest::testFinacialDollardeFormula()
+void ScOpenCLTest::testFinacialDollardeFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1397,7 +1397,7 @@ void ScOpenclTest::testFinacialDollardeFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-70]
-void ScOpenclTest::testFinancialCoupdaysFormula()
+void ScOpenCLTest::testFinancialCoupdaysFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1417,7 +1417,7 @@ void ScOpenclTest::testFinancialCoupdaysFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-72]
-void ScOpenclTest::testFinancialCoupdaysncFormula()
+void ScOpenCLTest::testFinancialCoupdaysncFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1436,7 +1436,7 @@ void ScOpenclTest::testFinancialCoupdaysncFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialRateFormula()
+void ScOpenCLTest::testFinacialRateFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1456,7 +1456,7 @@ void ScOpenclTest::testFinacialRateFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-54]
-void ScOpenclTest::testFinancialAccrintmFormula()
+void ScOpenCLTest::testFinancialAccrintmFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1476,7 +1476,7 @@ void ScOpenclTest::testFinancialAccrintmFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-74]
-void ScOpenclTest::testFinancialCoupnumFormula()
+void ScOpenCLTest::testFinancialCoupnumFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1497,7 +1497,7 @@ void ScOpenclTest::testFinancialCoupnumFormula()
}
//[AMLOEXT-57]
-void ScOpenclTest::testStatisticalFormulaNegbinomdist()
+void ScOpenCLTest::testStatisticalFormulaNegbinomdist()
{
if (!detectOpenCLDevice())
return;
@@ -1518,7 +1518,7 @@ void ScOpenclTest::testStatisticalFormulaNegbinomdist()
xDocShRes->DoClose();
}
//[AMLOEXT-58]
-void ScOpenclTest::testMathFormulaSin()
+void ScOpenCLTest::testMathFormulaSin()
{
if (!detectOpenCLDevice())
return;
@@ -1538,7 +1538,7 @@ void ScOpenclTest::testMathFormulaSin()
xDocShRes->DoClose();
}
//[AMLOEXT-59]
-void ScOpenclTest::testMathFormulaSumSQ()
+void ScOpenCLTest::testMathFormulaSumSQ()
{
if (!detectOpenCLDevice())
return;
@@ -1558,7 +1558,7 @@ void ScOpenclTest::testMathFormulaSumSQ()
xDocShRes->DoClose();
}
//[AMLOEXT-60]
-void ScOpenclTest::testMathFormulaTan()
+void ScOpenCLTest::testMathFormulaTan()
{
if (!detectOpenCLDevice())
return;
@@ -1578,7 +1578,7 @@ void ScOpenclTest::testMathFormulaTan()
xDocShRes->DoClose();
}
//[AMLOEXT-61]
-void ScOpenclTest::testMathFormulaTanH()
+void ScOpenCLTest::testMathFormulaTanH()
{
if (!detectOpenCLDevice())
return;
@@ -1598,7 +1598,7 @@ void ScOpenclTest::testMathFormulaTanH()
xDocShRes->DoClose();
}
//[AMLOEXT-62]
-void ScOpenclTest::testMathFormulaSqrt()
+void ScOpenCLTest::testMathFormulaSqrt()
{
if (!detectOpenCLDevice())
return;
@@ -1618,7 +1618,7 @@ void ScOpenclTest::testMathFormulaSqrt()
xDocShRes->DoClose();
}
//[AMLOEXT-63]
-void ScOpenclTest::testFinacialPriceFormula()
+void ScOpenCLTest::testFinacialPriceFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1638,7 +1638,7 @@ void ScOpenclTest::testFinacialPriceFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-64]
-void ScOpenclTest::testFinacialDollarfrFormula()
+void ScOpenCLTest::testFinacialDollarfrFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1658,7 +1658,7 @@ void ScOpenclTest::testFinacialDollarfrFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-65]
-void ScOpenclTest::testFinacialPriceDiscFormula()
+void ScOpenCLTest::testFinacialPriceDiscFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1678,7 +1678,7 @@ void ScOpenclTest::testFinacialPriceDiscFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-67]
-void ScOpenclTest::testFinacialODDLPRICEFormula()
+void ScOpenCLTest::testFinacialODDLPRICEFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1698,7 +1698,7 @@ void ScOpenclTest::testFinacialODDLPRICEFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-68]
-void ScOpenclTest:: testFinacialOddlyieldFormula()
+void ScOpenCLTest:: testFinacialOddlyieldFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1718,7 +1718,7 @@ void ScOpenclTest:: testFinacialOddlyieldFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-71]
-void ScOpenclTest::testFinacialDISCFormula()
+void ScOpenCLTest::testFinacialDISCFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1738,7 +1738,7 @@ void ScOpenclTest::testFinacialDISCFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-73]
-void ScOpenclTest:: testFinacialPVFormula()
+void ScOpenCLTest:: testFinacialPVFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1758,7 +1758,7 @@ void ScOpenclTest:: testFinacialPVFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-75]
-void ScOpenclTest::testFinacialINTRATEFormula()
+void ScOpenCLTest::testFinacialINTRATEFormula()
{
if (!detectOpenCLDevice())
return;
@@ -1778,7 +1778,7 @@ void ScOpenclTest::testFinacialINTRATEFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-77]
-void ScOpenclTest::testStatisticalFormulaStandard()
+void ScOpenCLTest::testStatisticalFormulaStandard()
{
if (!detectOpenCLDevice())
return;
@@ -1801,7 +1801,7 @@ void ScOpenclTest::testStatisticalFormulaStandard()
xDocShRes->DoClose();
}
//[AMLOEXT-78]
-void ScOpenclTest::testStatisticalFormulaWeibull()
+void ScOpenCLTest::testStatisticalFormulaWeibull()
{
if (!detectOpenCLDevice())
return;
@@ -1825,7 +1825,7 @@ void ScOpenclTest::testStatisticalFormulaWeibull()
xDocShRes->DoClose();
}
//[AMLOEXT-79]
-void ScOpenclTest::testStatisticalFormulaVar()
+void ScOpenCLTest::testStatisticalFormulaVar()
{
if (!detectOpenCLDevice())
return;
@@ -1848,7 +1848,7 @@ void ScOpenclTest::testStatisticalFormulaVar()
xDocShRes->DoClose();
}
//[AMLOEXT-80]
-void ScOpenclTest::testStatisticalFormulaSkew()
+void ScOpenCLTest::testStatisticalFormulaSkew()
{
if (!detectOpenCLDevice())
return;
@@ -1871,7 +1871,7 @@ void ScOpenclTest::testStatisticalFormulaSkew()
xDocShRes->DoClose();
}
//[AMLOEXT-81]
-void ScOpenclTest::testStatisticalFormulaSkewp()
+void ScOpenCLTest::testStatisticalFormulaSkewp()
{
if (!detectOpenCLDevice())
return;
@@ -1894,7 +1894,7 @@ void ScOpenclTest::testStatisticalFormulaSkewp()
xDocShRes->DoClose();
}
//[AMLOEXT-82]
-void ScOpenclTest::testStatisticalFormulaPearson()
+void ScOpenCLTest::testStatisticalFormulaPearson()
{
if (!detectOpenCLDevice())
return;
@@ -1915,7 +1915,7 @@ void ScOpenclTest::testStatisticalFormulaPearson()
xDocShRes->DoClose();
}
//[AMLOEXT-83]
-void ScOpenclTest::testStatisticalFormulaRsq()
+void ScOpenCLTest::testStatisticalFormulaRsq()
{
if (!detectOpenCLDevice())
return;
@@ -1936,7 +1936,7 @@ void ScOpenclTest::testStatisticalFormulaRsq()
xDocShRes->DoClose();
}
//[AMLOEXT-84]
-void ScOpenclTest::testMathFormulaTrunc()
+void ScOpenCLTest::testMathFormulaTrunc()
{
if (!detectOpenCLDevice())
return;
@@ -1956,7 +1956,7 @@ void ScOpenclTest::testMathFormulaTrunc()
xDocShRes->DoClose();
}
//[AMLOEXT-85]
-void ScOpenclTest::testMathFormulaCosh()
+void ScOpenCLTest::testMathFormulaCosh()
{
if (!detectOpenCLDevice())
return;
@@ -1976,7 +1976,7 @@ void ScOpenclTest::testMathFormulaCosh()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testStatisticalFormulaCovar()
+void ScOpenCLTest::testStatisticalFormulaCovar()
{
if (!detectOpenCLDevice())
return;
@@ -2000,7 +2000,7 @@ void ScOpenclTest::testStatisticalFormulaCovar()
}
//[AMLOEXT-87]
-void ScOpenclTest::testStatisticalFormulaKurt()
+void ScOpenCLTest::testStatisticalFormulaKurt()
{
if (!detectOpenCLDevice())
return;
@@ -2021,7 +2021,7 @@ void ScOpenclTest::testStatisticalFormulaKurt()
xDocShRes->DoClose();
}
//[AMLOEXT-88]
-void ScOpenclTest::testMathFormulaCot()
+void ScOpenCLTest::testMathFormulaCot()
{
if (!detectOpenCLDevice())
return;
@@ -2042,7 +2042,7 @@ void ScOpenclTest::testMathFormulaCot()
xDocShRes->DoClose();
}
//[AMLOEXT-89]
-void ScOpenclTest::testStatisticalFormulaDevSq()
+void ScOpenCLTest::testStatisticalFormulaDevSq()
{
if (!detectOpenCLDevice())
return;
@@ -2065,7 +2065,7 @@ void ScOpenclTest::testStatisticalFormulaDevSq()
xDocShRes->DoClose();
}
//[AMLOEXT-90]
-void ScOpenclTest::testMathFormulaCsc()
+void ScOpenCLTest::testMathFormulaCsc()
{
if (!detectOpenCLDevice())
return;
@@ -2085,7 +2085,7 @@ void ScOpenclTest::testMathFormulaCsc()
xDocShRes->DoClose();
}
//[AMLOEXT-91]
-void ScOpenclTest::testMathFormulaCoth()
+void ScOpenCLTest::testMathFormulaCoth()
{
if (!detectOpenCLDevice())
return;
@@ -2106,7 +2106,7 @@ void ScOpenclTest::testMathFormulaCoth()
xDocShRes->DoClose();
}
//[AMLOEXT-92]
-void ScOpenclTest::testFinacialXNPVFormula()
+void ScOpenCLTest::testFinacialXNPVFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2133,7 +2133,7 @@ void ScOpenclTest::testFinacialXNPVFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-93]
-void ScOpenclTest::testStatisticalFormulaIntercept()
+void ScOpenCLTest::testStatisticalFormulaIntercept()
{
if (!detectOpenCLDevice())
return;
@@ -2154,7 +2154,7 @@ void ScOpenclTest::testStatisticalFormulaIntercept()
xDocShRes->DoClose();
}
//[AMLOEXT-98]
-void ScOpenclTest::testFinancialAmordegrcFormula()
+void ScOpenCLTest::testFinancialAmordegrcFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2174,7 +2174,7 @@ void ScOpenclTest::testFinancialAmordegrcFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-99]
-void ScOpenclTest:: testFinancialISPMTFormula()
+void ScOpenCLTest:: testFinancialISPMTFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2194,7 +2194,7 @@ void ScOpenclTest:: testFinancialISPMTFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-100]
-void ScOpenclTest::testStatisticalFormulaMedian()
+void ScOpenCLTest::testStatisticalFormulaMedian()
{
if (!detectOpenCLDevice())
return;
@@ -2215,7 +2215,7 @@ void ScOpenclTest::testStatisticalFormulaMedian()
xDocShRes->DoClose();
}
//[AMLOEXT-101]
-void ScOpenclTest::testStatisticalFormulaNormdist()
+void ScOpenCLTest::testStatisticalFormulaNormdist()
{
if (!detectOpenCLDevice())
return;
@@ -2236,7 +2236,7 @@ void ScOpenclTest::testStatisticalFormulaNormdist()
xDocShRes->DoClose();
}
//[AMLOEXT-102]
-void ScOpenclTest::testStatisticalFormulaNormsdist()
+void ScOpenCLTest::testStatisticalFormulaNormsdist()
{
if (!detectOpenCLDevice())
return;
@@ -2257,7 +2257,7 @@ void ScOpenclTest::testStatisticalFormulaNormsdist()
xDocShRes->DoClose();
}
//[AMLOEXT-103]
-void ScOpenclTest::testStatisticalFormulaPermut()
+void ScOpenCLTest::testStatisticalFormulaPermut()
{
if (!detectOpenCLDevice())
return;
@@ -2278,7 +2278,7 @@ void ScOpenclTest::testStatisticalFormulaPermut()
xDocShRes->DoClose();
}
//[AMLOEXT-104]
-void ScOpenclTest::testStatisticalFormulaPermutation()
+void ScOpenCLTest::testStatisticalFormulaPermutation()
{
if (!detectOpenCLDevice())
return;
@@ -2299,7 +2299,7 @@ void ScOpenclTest::testStatisticalFormulaPermutation()
xDocShRes->DoClose();
}
//[AMLOEXT-105]
-void ScOpenclTest::testStatisticalFormulaPhi()
+void ScOpenCLTest::testStatisticalFormulaPhi()
{
if (!detectOpenCLDevice())
return;
@@ -2320,7 +2320,7 @@ void ScOpenclTest::testStatisticalFormulaPhi()
xDocShRes->DoClose();
}
//[AMLOEXT-106]
-void ScOpenclTest::testMathFormulaCscH()
+void ScOpenCLTest::testMathFormulaCscH()
{
if (!detectOpenCLDevice())
return;
@@ -2340,7 +2340,7 @@ void ScOpenclTest::testMathFormulaCscH()
xDocShRes->DoClose();
}
//[AMLOEXT-107]
-void ScOpenclTest::testStatisticalFormulaLogInv()
+void ScOpenCLTest::testStatisticalFormulaLogInv()
{
if (!detectOpenCLDevice())
return;
@@ -2362,7 +2362,7 @@ void ScOpenclTest::testStatisticalFormulaLogInv()
xDocShRes->DoClose();
}
//[AMLOEXT-108]
-void ScOpenclTest::testFinacialNPERFormula()
+void ScOpenCLTest::testFinacialNPERFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2382,7 +2382,7 @@ void ScOpenclTest::testFinacialNPERFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-109]
-void ScOpenclTest::testStatisticalFormulaForecast()
+void ScOpenCLTest::testStatisticalFormulaForecast()
{
if (!detectOpenCLDevice())
return;
@@ -2404,7 +2404,7 @@ void ScOpenclTest::testStatisticalFormulaForecast()
xDocShRes->DoClose();
}
//[AMLOEXT-110]
-void ScOpenclTest::testFinancialAmorlincFormula()
+void ScOpenCLTest::testFinancialAmorlincFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2424,7 +2424,7 @@ void ScOpenclTest::testFinancialAmorlincFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-124]
-void ScOpenclTest::testFinancialDDBFormula()
+void ScOpenCLTest::testFinancialDDBFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2443,7 +2443,7 @@ void ScOpenclTest::testFinancialDDBFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialPriceMatFormula()
+void ScOpenCLTest::testFinacialPriceMatFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2462,7 +2462,7 @@ void ScOpenclTest::testFinacialPriceMatFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialFormulaReceived()
+void ScOpenCLTest::testFinacialFormulaReceived()
{
if (!detectOpenCLDevice())
return;
@@ -2482,7 +2482,7 @@ void ScOpenclTest::testFinacialFormulaReceived()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinancialFormulaCumipmt()
+void ScOpenCLTest::testFinancialFormulaCumipmt()
{
if (!detectOpenCLDevice())
return;
@@ -2502,7 +2502,7 @@ void ScOpenclTest::testFinancialFormulaCumipmt()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinancialFormulaCumprinc()
+void ScOpenCLTest::testFinancialFormulaCumprinc()
{
if (!detectOpenCLDevice())
return;
@@ -2522,7 +2522,7 @@ void ScOpenclTest::testFinancialFormulaCumprinc()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialRRIFormula()
+void ScOpenCLTest::testFinacialRRIFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2541,7 +2541,7 @@ void ScOpenclTest::testFinacialRRIFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialEFFECT_ADDFormula()
+void ScOpenCLTest::testFinacialEFFECT_ADDFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2560,7 +2560,7 @@ void ScOpenclTest::testFinacialEFFECT_ADDFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialNominalFormula()
+void ScOpenCLTest::testFinacialNominalFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2580,7 +2580,7 @@ void ScOpenclTest::testFinacialNominalFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialTBILLEQFormula()
+void ScOpenCLTest::testFinacialTBILLEQFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2599,7 +2599,7 @@ void ScOpenclTest::testFinacialTBILLEQFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialTBILLPRICEFormula()
+void ScOpenCLTest::testFinacialTBILLPRICEFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2618,7 +2618,7 @@ void ScOpenclTest::testFinacialTBILLPRICEFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialTBILLYIELDFormula()
+void ScOpenCLTest::testFinacialTBILLYIELDFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2637,7 +2637,7 @@ void ScOpenclTest::testFinacialTBILLYIELDFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialYIELDFormula()
+void ScOpenCLTest::testFinacialYIELDFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2657,7 +2657,7 @@ void ScOpenclTest::testFinacialYIELDFormula()
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialYIELDDISCFormula()
+void ScOpenCLTest::testFinacialYIELDDISCFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2677,7 +2677,7 @@ void ScOpenclTest::testFinacialYIELDDISCFormula()
xDocShRes->DoClose();
}
-void ScOpenclTest::testFinacialYIELDMATFormula()
+void ScOpenCLTest::testFinacialYIELDMATFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2696,7 +2696,7 @@ void ScOpenclTest::testFinacialYIELDMATFormula()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-void ScOpenclTest:: testFinacialPMTFormula()
+void ScOpenCLTest:: testFinacialPMTFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2716,7 +2716,7 @@ void ScOpenclTest:: testFinacialPMTFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-111]
-void ScOpenclTest:: testFinancialDurationFormula()
+void ScOpenCLTest:: testFinancialDurationFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2736,7 +2736,7 @@ void ScOpenclTest:: testFinancialDurationFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-112]
-void ScOpenclTest::testStatisticalFormulaLogNormDist()
+void ScOpenCLTest::testStatisticalFormulaLogNormDist()
{
if (!detectOpenCLDevice())
return;
@@ -2759,7 +2759,7 @@ void ScOpenclTest::testStatisticalFormulaLogNormDist()
xDocShRes->DoClose();
}
//[AMLOEXT-113]
-void ScOpenclTest::testMathFormulaArcCos()
+void ScOpenCLTest::testMathFormulaArcCos()
{
if (!detectOpenCLDevice())
return;
@@ -2780,7 +2780,7 @@ void ScOpenclTest::testMathFormulaArcCos()
xDocShRes->DoClose();
}
//[AMLOEXT-117]
-void ScOpenclTest::testMathFormulaPower()
+void ScOpenCLTest::testMathFormulaPower()
{
if (!detectOpenCLDevice())
return;
@@ -2800,7 +2800,7 @@ void ScOpenclTest::testMathFormulaPower()
xDocShRes->DoClose();
}
//[AMLOEXT-119]
-void ScOpenclTest:: testFinacialPPMTFormula()
+void ScOpenCLTest:: testFinacialPPMTFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2820,7 +2820,7 @@ void ScOpenclTest:: testFinacialPPMTFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-120]
-void ScOpenclTest:: testFinacialNPVFormula()
+void ScOpenCLTest:: testFinacialNPVFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2840,7 +2840,7 @@ void ScOpenclTest:: testFinacialNPVFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-121]
-void ScOpenclTest:: testFinancialDuration_ADDFormula()
+void ScOpenCLTest:: testFinancialDuration_ADDFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2860,7 +2860,7 @@ void ScOpenclTest:: testFinancialDuration_ADDFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-122]
-void ScOpenclTest::testStatisticalFormulaNorminv()
+void ScOpenCLTest::testStatisticalFormulaNorminv()
{
if (!detectOpenCLDevice())
return;
@@ -2881,7 +2881,7 @@ void ScOpenclTest::testStatisticalFormulaNorminv()
xDocShRes->DoClose();
}
//[AMLOEXT-123]
-void ScOpenclTest::testStatisticalFormulaNormsinv()
+void ScOpenCLTest::testStatisticalFormulaNormsinv()
{
if (!detectOpenCLDevice())
return;
@@ -2902,7 +2902,7 @@ void ScOpenclTest::testStatisticalFormulaNormsinv()
xDocShRes->DoClose();
}
//[AMLOEXT-125]
-void ScOpenclTest::testMathFormulaArcCosHyp()
+void ScOpenCLTest::testMathFormulaArcCosHyp()
{
if (!detectOpenCLDevice())
return;
@@ -2923,7 +2923,7 @@ void ScOpenclTest::testMathFormulaArcCosHyp()
xDocShRes->DoClose();
}
//[AMLOEXT-126]
-void ScOpenclTest:: testFinancialMDurationFormula()
+void ScOpenCLTest:: testFinancialMDurationFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2943,7 +2943,7 @@ void ScOpenclTest:: testFinancialMDurationFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-127]
-void ScOpenclTest::testMathFormulaArcCot()
+void ScOpenCLTest::testMathFormulaArcCot()
{
if (!detectOpenCLDevice())
return;
@@ -2964,7 +2964,7 @@ void ScOpenclTest::testMathFormulaArcCot()
xDocShRes->DoClose();
}
//[AMLOEXT-131]
-void ScOpenclTest:: testFinancialFVFormula()
+void ScOpenCLTest:: testFinancialFVFormula()
{
if (!detectOpenCLDevice())
return;
@@ -2984,7 +2984,7 @@ void ScOpenclTest:: testFinancialFVFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-132]
-void ScOpenclTest::testFinancialDBFormula()
+void ScOpenCLTest::testFinancialDBFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3004,7 +3004,7 @@ void ScOpenclTest::testFinancialDBFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-135]
-void ScOpenclTest::testFinancialCouppcdFormula()
+void ScOpenCLTest::testFinancialCouppcdFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3024,7 +3024,7 @@ void ScOpenclTest::testFinancialCouppcdFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-128]
-void ScOpenclTest::testMathSumIfsFormula()
+void ScOpenCLTest::testMathSumIfsFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3062,7 +3062,7 @@ void ScOpenclTest::testMathSumIfsFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-129]
-void ScOpenclTest::testMathFormulaArcCotHyp()
+void ScOpenCLTest::testMathFormulaArcCotHyp()
{
if (!detectOpenCLDevice())
return;
@@ -3083,7 +3083,7 @@ void ScOpenclTest::testMathFormulaArcCotHyp()
xDocShRes->DoClose();
}
//[AMLOEXT-130]
-void ScOpenclTest::testMathFormulaArcSin()
+void ScOpenCLTest::testMathFormulaArcSin()
{
if (!detectOpenCLDevice())
return;
@@ -3104,7 +3104,7 @@ void ScOpenclTest::testMathFormulaArcSin()
xDocShRes->DoClose();
}
//[AMLOEXT-133]
-void ScOpenclTest:: testFinancialVDBFormula()
+void ScOpenCLTest:: testFinancialVDBFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3136,7 +3136,7 @@ void ScOpenclTest:: testFinancialVDBFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-134]
-void ScOpenclTest:: testFinancialIPMTFormula()
+void ScOpenCLTest:: testFinancialIPMTFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3156,7 +3156,7 @@ void ScOpenclTest:: testFinancialIPMTFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-137]
-void ScOpenclTest:: testFinancialXirrFormula()
+void ScOpenCLTest:: testFinancialXirrFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3183,7 +3183,7 @@ void ScOpenclTest:: testFinancialXirrFormula()
xDocSh->DoClose();
}
//[AMLOEXT-139]
-void ScOpenclTest::testStatisticalFormulaChiSqDist()
+void ScOpenCLTest::testStatisticalFormulaChiSqDist()
{
if (!detectOpenCLDevice())
return;
@@ -3210,7 +3210,7 @@ void ScOpenclTest::testStatisticalFormulaChiSqDist()
xDocShRes->DoClose();
}
//[AMLOEXT-140]
-void ScOpenclTest::testStatisticalFormulaConfidence()
+void ScOpenCLTest::testStatisticalFormulaConfidence()
{
if (!detectOpenCLDevice())
return;
@@ -3233,7 +3233,7 @@ void ScOpenclTest::testStatisticalFormulaConfidence()
xDocShRes->DoClose();
}
//[AMLOEXT-141]
-void ScOpenclTest::testStatisticalFormulaFDist()
+void ScOpenCLTest::testStatisticalFormulaFDist()
{
if (!detectOpenCLDevice())
return;
@@ -3254,7 +3254,7 @@ void ScOpenclTest::testStatisticalFormulaFDist()
xDocShRes->DoClose();
}
//[AMLOEXT-136]
-void ScOpenclTest::testFinancialCoupncdFormula()
+void ScOpenCLTest::testFinancialCoupncdFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3274,7 +3274,7 @@ void ScOpenclTest::testFinancialCoupncdFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-138]
-void ScOpenclTest::testFinancialAccrintFormula()
+void ScOpenCLTest::testFinancialAccrintFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3294,7 +3294,7 @@ void ScOpenclTest::testFinancialAccrintFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-142]
-void ScOpenclTest::testStatisticalFormulaCritBinom()
+void ScOpenCLTest::testStatisticalFormulaCritBinom()
{
if (!detectOpenCLDevice())
return;
@@ -3317,7 +3317,7 @@ void ScOpenclTest::testStatisticalFormulaCritBinom()
xDocShRes->DoClose();
}
//[AMLOEXT-143]
-void ScOpenclTest::testMathFormulaArcSinHyp()
+void ScOpenCLTest::testMathFormulaArcSinHyp()
{
if (!detectOpenCLDevice())
return;
@@ -3338,7 +3338,7 @@ void ScOpenclTest::testMathFormulaArcSinHyp()
xDocShRes->DoClose();
}
//[AMLOEXT-144]
-void ScOpenclTest::testMathFormulaArcTan()
+void ScOpenCLTest::testMathFormulaArcTan()
{
if (!detectOpenCLDevice())
return;
@@ -3359,7 +3359,7 @@ void ScOpenclTest::testMathFormulaArcTan()
xDocShRes->DoClose();
}
//[AMLOEXT-145]
-void ScOpenclTest::testMathFormulaArcTanHyp()
+void ScOpenCLTest::testMathFormulaArcTanHyp()
{
if (!detectOpenCLDevice())
return;
@@ -3380,7 +3380,7 @@ void ScOpenclTest::testMathFormulaArcTanHyp()
xDocShRes->DoClose();
}
//[AMLOEXT-146]
-void ScOpenclTest:: testFinacialNPER1Formula()
+void ScOpenCLTest:: testFinacialNPER1Formula()
{
if (!detectOpenCLDevice())
return;
@@ -3400,7 +3400,7 @@ void ScOpenclTest:: testFinacialNPER1Formula()
xDocShRes->DoClose();
}
//[AMLOEXT-147]
-void ScOpenclTest::testMathFormulaArcTan2()
+void ScOpenCLTest::testMathFormulaArcTan2()
{
if (!detectOpenCLDevice())
return;
@@ -3422,7 +3422,7 @@ void ScOpenclTest::testMathFormulaArcTan2()
}
//[AMLOEXT-148]
-void ScOpenclTest::testStatisticalFormulaChiSqInv()
+void ScOpenCLTest::testStatisticalFormulaChiSqInv()
{
if (!detectOpenCLDevice())
return;
@@ -3443,7 +3443,7 @@ void ScOpenclTest::testStatisticalFormulaChiSqInv()
xDocShRes->DoClose();
}
//[AMLOEXT-149]
-void ScOpenclTest::testMathFormulaBitAnd()
+void ScOpenCLTest::testMathFormulaBitAnd()
{
if (!detectOpenCLDevice())
return;
@@ -3464,7 +3464,7 @@ void ScOpenclTest::testMathFormulaBitAnd()
xDocShRes->DoClose();
}
//[AMLOEXT-150]
-void ScOpenclTest::testStatisticalFormulaPoisson()
+void ScOpenCLTest::testStatisticalFormulaPoisson()
{
if (!detectOpenCLDevice())
return;
@@ -3485,7 +3485,7 @@ void ScOpenclTest::testStatisticalFormulaPoisson()
xDocShRes->DoClose();
}
//[AMLOEXT-151]
-void ScOpenclTest::testStatisticalFormulaExpondist()
+void ScOpenCLTest::testStatisticalFormulaExpondist()
{
if (!detectOpenCLDevice())
return;
@@ -3506,7 +3506,7 @@ void ScOpenclTest::testStatisticalFormulaExpondist()
xDocShRes->DoClose();
}
//[AMLOEXT-152]
-void ScOpenclTest::testMathFormulaBitOr()
+void ScOpenCLTest::testMathFormulaBitOr()
{
if (!detectOpenCLDevice())
return;
@@ -3528,7 +3528,7 @@ void ScOpenclTest::testMathFormulaBitOr()
}
//[AMLOEXT-153]
-void ScOpenclTest::testMathFormulaOdd()
+void ScOpenCLTest::testMathFormulaOdd()
{
if (!detectOpenCLDevice())
return;
@@ -3548,7 +3548,7 @@ void ScOpenclTest::testMathFormulaOdd()
xDocShRes->DoClose();
}
//[AMLOEXT-154]
-void ScOpenclTest::testMathFormulaLN()
+void ScOpenCLTest::testMathFormulaLN()
{
if (!detectOpenCLDevice())
return;
@@ -3569,7 +3569,7 @@ void ScOpenclTest::testMathFormulaLN()
xDocShRes->DoClose();
}
//AMLOEXT-155
-void ScOpenclTest::testMathFormulaMod()
+void ScOpenCLTest::testMathFormulaMod()
{
if (!detectOpenCLDevice())
return;
@@ -3593,7 +3593,7 @@ void ScOpenclTest::testMathFormulaMod()
xDocShRes->DoClose();
}
//[ AMLOEXT-156]
-void ScOpenclTest::testMathFormulaRound()
+void ScOpenCLTest::testMathFormulaRound()
{
if (!detectOpenCLDevice())
return;
@@ -3620,7 +3620,7 @@ void ScOpenclTest::testMathFormulaRound()
xDocShRes->DoClose();
}
//[AMLOEXT-157]
-void ScOpenclTest::testStatisticalFormulaGammaDist()
+void ScOpenCLTest::testStatisticalFormulaGammaDist()
{
if (!detectOpenCLDevice())
return;
@@ -3642,7 +3642,7 @@ void ScOpenclTest::testStatisticalFormulaGammaDist()
xDocShRes->DoClose();
}
//[AMLOEXT-158]
-void ScOpenclTest::testStatisticalFormulaGammaInv()
+void ScOpenCLTest::testStatisticalFormulaGammaInv()
{
if (!detectOpenCLDevice())
return;
@@ -3667,7 +3667,7 @@ void ScOpenclTest::testStatisticalFormulaGammaInv()
xDocShRes->DoClose();
}
//[AMLOEXT-159]
-void ScOpenclTest::testStatisticalFormulaFInv()
+void ScOpenCLTest::testStatisticalFormulaFInv()
{
if (!detectOpenCLDevice())
return;
@@ -3692,7 +3692,7 @@ void ScOpenclTest::testStatisticalFormulaFInv()
xDocShRes->DoClose();
}
//[AMLOEXT-160]
-void ScOpenclTest::testStatisticalFormulaFTest()
+void ScOpenCLTest::testStatisticalFormulaFTest()
{
if (!detectOpenCLDevice())
return;
@@ -3714,7 +3714,7 @@ void ScOpenclTest::testStatisticalFormulaFTest()
xDocShRes->DoClose();
}
//[AMLOEXT-161]
-void ScOpenclTest::testStatisticalFormulaB()
+void ScOpenCLTest::testStatisticalFormulaB()
{
if (!detectOpenCLDevice())
return;
@@ -3738,7 +3738,7 @@ void ScOpenclTest::testStatisticalFormulaB()
xDocShRes->DoClose();
}
//[AMLOEXT-162]
-void ScOpenclTest::testStatisticalFormulaBetaDist()
+void ScOpenCLTest::testStatisticalFormulaBetaDist()
{
if (!detectOpenCLDevice())
return;
@@ -3762,7 +3762,7 @@ void ScOpenclTest::testStatisticalFormulaBetaDist()
xDocShRes->DoClose();
}
//AMLOEXT-164
-void ScOpenclTest::testMathFormulaEven()
+void ScOpenCLTest::testMathFormulaEven()
{
if (!detectOpenCLDevice())
return;
@@ -3784,7 +3784,7 @@ void ScOpenclTest::testMathFormulaEven()
}
//[AMLOEXT-165]
-void ScOpenclTest::testMathFormulaExp()
+void ScOpenCLTest::testMathFormulaExp()
{
if (!detectOpenCLDevice())
return;
@@ -3804,7 +3804,7 @@ void ScOpenclTest::testMathFormulaExp()
xDocShRes->DoClose();
}
//[AMLOEXT-166]
-void ScOpenclTest::testStatisticalFormulaChiDist()
+void ScOpenCLTest::testStatisticalFormulaChiDist()
{
if (!detectOpenCLDevice())
return;
@@ -3825,7 +3825,7 @@ void ScOpenclTest::testStatisticalFormulaChiDist()
xDocShRes->DoClose();
}
//[AMLOEXT-167]
-void ScOpenclTest::testMathFormulaBitLshift()
+void ScOpenCLTest::testMathFormulaBitLshift()
{
if (!detectOpenCLDevice())
return;
@@ -3846,7 +3846,7 @@ void ScOpenclTest::testMathFormulaBitLshift()
xDocShRes->DoClose();
}
//[AMLOEXT-168]
-void ScOpenclTest::testMathFormulaBitRshift()
+void ScOpenCLTest::testMathFormulaBitRshift()
{
if (!detectOpenCLDevice())
return;
@@ -3867,7 +3867,7 @@ void ScOpenclTest::testMathFormulaBitRshift()
xDocShRes->DoClose();
}
//[AMLOEXT-169]
-void ScOpenclTest::testMathFormulaFloor()
+void ScOpenCLTest::testMathFormulaFloor()
{
if (!detectOpenCLDevice())
return;
@@ -3887,7 +3887,7 @@ void ScOpenclTest::testMathFormulaFloor()
xDocShRes->DoClose();
}
//[AMLOEXT-170]
-void ScOpenclTest::testMathFormulaLog()
+void ScOpenCLTest::testMathFormulaLog()
{
if (!detectOpenCLDevice())
return;
@@ -3908,7 +3908,7 @@ void ScOpenclTest::testMathFormulaLog()
xDocShRes->DoClose();
}
//[AMLOEXT-171]
-void ScOpenclTest::testSpreadSheetFormulaVLookup()
+void ScOpenCLTest::testSpreadSheetFormulaVLookup()
{
if (!detectOpenCLDevice())
return;
@@ -3935,7 +3935,7 @@ void ScOpenclTest::testSpreadSheetFormulaVLookup()
xDocShRes->DoClose();
}
//[AMLOEXT-173]
-void ScOpenclTest::testStatisticalFormulaChiInv()
+void ScOpenCLTest::testStatisticalFormulaChiInv()
{
if (!detectOpenCLDevice())
return;
@@ -3956,7 +3956,7 @@ void ScOpenclTest::testStatisticalFormulaChiInv()
xDocShRes->DoClose();
}
//[AMLOEXT-175]
-void ScOpenclTest::testMathFormulaConvert()
+void ScOpenCLTest::testMathFormulaConvert()
{
if (!detectOpenCLDevice())
return;
@@ -3976,7 +3976,7 @@ void ScOpenclTest::testMathFormulaConvert()
xDocShRes->DoClose();
}
//[ AMLOEXT-176 ]
-void ScOpenclTest::testMathCountIfsFormula()
+void ScOpenCLTest::testMathCountIfsFormula()
{
if (!detectOpenCLDevice())
return;
@@ -3996,7 +3996,7 @@ void ScOpenclTest::testMathCountIfsFormula()
xDocShRes->DoClose();
}
//[AMLOEXT-178]
-void ScOpenclTest::testMathFormulaBitXor()
+void ScOpenCLTest::testMathFormulaBitXor()
{
if (!detectOpenCLDevice())
return;
@@ -4017,7 +4017,7 @@ void ScOpenclTest::testMathFormulaBitXor()
xDocShRes->DoClose();
}
//[ AMLOEXT-179]
-void ScOpenclTest::testMathAverageIfsFormula()
+void ScOpenCLTest::testMathAverageIfsFormula()
{
if (!detectOpenCLDevice())
return;
@@ -4038,7 +4038,7 @@ void ScOpenclTest::testMathAverageIfsFormula()
}
//[AMLOEXT-180]
-void ScOpenclTest::testMathFormulaLog10()
+void ScOpenCLTest::testMathFormulaLog10()
{
if (!detectOpenCLDevice())
return;
@@ -4058,7 +4058,7 @@ void ScOpenclTest::testMathFormulaLog10()
xDocShRes->DoClose();
}
//[AMLOEXT-174]
-void ScOpenclTest::testMathFormulaCombina()
+void ScOpenCLTest::testMathFormulaCombina()
{
if (!detectOpenCLDevice())
return;
@@ -4079,7 +4079,7 @@ void ScOpenclTest::testMathFormulaCombina()
xDocShRes->DoClose();
}
//[AMLOEXT-181]
-void ScOpenclTest::testMathFormulaCeil()
+void ScOpenCLTest::testMathFormulaCeil()
{
if (!detectOpenCLDevice())
return;
@@ -4100,7 +4100,7 @@ void ScOpenclTest::testMathFormulaCeil()
xDocShRes->DoClose();
}
//[AMLOEXT-182]
-void ScOpenclTest::testMathFormulaSqrtPi()
+void ScOpenCLTest::testMathFormulaSqrtPi()
{
if (!detectOpenCLDevice())
return;
@@ -4120,7 +4120,7 @@ void ScOpenclTest::testMathFormulaSqrtPi()
xDocShRes->DoClose();
}
//[AMLOEXT-183]
-void ScOpenclTest::testStatisticalFormulaVarP()
+void ScOpenCLTest::testStatisticalFormulaVarP()
{
if (!detectOpenCLDevice())
return;
@@ -4143,7 +4143,7 @@ void ScOpenclTest::testStatisticalFormulaVarP()
xDocShRes->DoClose();
}
//[AMLOEXT-184]
-void ScOpenclTest::testStatisticalFormulaStDev()
+void ScOpenCLTest::testStatisticalFormulaStDev()
{
if (!detectOpenCLDevice())
return;
@@ -4166,7 +4166,7 @@ void ScOpenclTest::testStatisticalFormulaStDev()
xDocShRes->DoClose();
}
//[AMLOEXT-185]
-void ScOpenclTest::testStatisticalFormulaStDevP()
+void ScOpenCLTest::testStatisticalFormulaStDevP()
{
if (!detectOpenCLDevice())
return;
@@ -4189,7 +4189,7 @@ void ScOpenclTest::testStatisticalFormulaStDevP()
xDocShRes->DoClose();
}
//[AMLOEXT-186]
-void ScOpenclTest::testStatisticalFormulaSlope()
+void ScOpenCLTest::testStatisticalFormulaSlope()
{
if (!detectOpenCLDevice())
return;
@@ -4212,7 +4212,7 @@ void ScOpenclTest::testStatisticalFormulaSlope()
xDocShRes->DoClose();
}
//[AMLOEXT-187]
-void ScOpenclTest::testStatisticalFormulaSTEYX()
+void ScOpenCLTest::testStatisticalFormulaSTEYX()
{
if (!detectOpenCLDevice())
return;
@@ -4235,7 +4235,7 @@ void ScOpenclTest::testStatisticalFormulaSTEYX()
xDocShRes->DoClose();
}
//[AMLOEXT-188]
-void ScOpenclTest::testStatisticalFormulaZTest()
+void ScOpenCLTest::testStatisticalFormulaZTest()
{
if (!detectOpenCLDevice())
return;
@@ -4258,7 +4258,7 @@ void ScOpenclTest::testStatisticalFormulaZTest()
xDocShRes->DoClose();
}
//[AMLOEXT-189]
-void ScOpenclTest::testStatisticalFormulaTTest()
+void ScOpenCLTest::testStatisticalFormulaTTest()
{
if (!detectOpenCLDevice())
return;
@@ -4281,7 +4281,7 @@ void ScOpenclTest::testStatisticalFormulaTTest()
xDocShRes->DoClose();
}
//[AMLOEXT-190]
-void ScOpenclTest::testStatisticalFormulaTDist()
+void ScOpenCLTest::testStatisticalFormulaTDist()
{
if (!detectOpenCLDevice())
return;
@@ -4304,7 +4304,7 @@ void ScOpenclTest::testStatisticalFormulaTDist()
xDocShRes->DoClose();
}
//[AMLOEXT-191]
-void ScOpenclTest::testStatisticalFormulaTInv()
+void ScOpenCLTest::testStatisticalFormulaTInv()
{
if (!detectOpenCLDevice())
return;
@@ -4327,7 +4327,7 @@ void ScOpenclTest::testStatisticalFormulaTInv()
xDocShRes->DoClose();
}
//[AMLOEXT-192]
-void ScOpenclTest::testStatisticalFormulaBinomDist()
+void ScOpenCLTest::testStatisticalFormulaBinomDist()
{
if (!detectOpenCLDevice())
return;
@@ -4348,7 +4348,7 @@ void ScOpenclTest::testStatisticalFormulaBinomDist()
xDocShRes->DoClose();
}
//[AMLOEXT-193]
-void ScOpenclTest::testMathFormulaProduct()
+void ScOpenCLTest::testMathFormulaProduct()
{
if (!detectOpenCLDevice())
return;
@@ -4369,7 +4369,7 @@ void ScOpenclTest::testMathFormulaProduct()
}
//[AMLOEXT-194]
#if 0 //Disabled temporarily
-void ScOpenclTest::testMathFormulaKombin()
+void ScOpenCLTest::testMathFormulaKombin()
{
if (!detectOpenCLDevice())
return;
@@ -4391,7 +4391,7 @@ void ScOpenclTest::testMathFormulaKombin()
}
#endif
//[AMLOEXT-198]
-void ScOpenclTest:: testArrayFormulaSumX2MY2()
+void ScOpenCLTest:: testArrayFormulaSumX2MY2()
{
if (!detectOpenCLDevice())
return;
@@ -4417,7 +4417,7 @@ void ScOpenclTest:: testArrayFormulaSumX2MY2()
xDocShRes->DoClose();
}
//[AMLOEXT-199]
-void ScOpenclTest::testStatisticalFormulaHypGeomDist()
+void ScOpenCLTest::testStatisticalFormulaHypGeomDist()
{
if (!detectOpenCLDevice())
return;
@@ -4438,7 +4438,7 @@ void ScOpenclTest::testStatisticalFormulaHypGeomDist()
xDocShRes->DoClose();
}
//[AMLOEXT-200]
-void ScOpenclTest:: testArrayFormulaSumX2PY2()
+void ScOpenCLTest:: testArrayFormulaSumX2PY2()
{
if (!detectOpenCLDevice())
return;
@@ -4464,7 +4464,7 @@ void ScOpenclTest:: testArrayFormulaSumX2PY2()
xDocShRes->DoClose();
}
//[AMLOEXT-201]
-void ScOpenclTest::testStatisticalFormulaBetainv()
+void ScOpenCLTest::testStatisticalFormulaBetainv()
{
if (!detectOpenCLDevice())
return;
@@ -4485,7 +4485,7 @@ void ScOpenclTest::testStatisticalFormulaBetainv()
xDocShRes->DoClose();
}
//[AMLOEXT-202]
-void ScOpenclTest::testStatisticalFormulaMina()
+void ScOpenCLTest::testStatisticalFormulaMina()
{
if (!detectOpenCLDevice())
return;
@@ -4505,7 +4505,7 @@ void ScOpenclTest::testStatisticalFormulaMina()
xDocShRes->DoClose();
}
//[ AMLOEXT-204]
-void ScOpenclTest:: testArrayFormulaSumXMY2()
+void ScOpenCLTest:: testArrayFormulaSumXMY2()
{
if (!detectOpenCLDevice())
return;
@@ -4531,7 +4531,7 @@ void ScOpenclTest:: testArrayFormulaSumXMY2()
xDocShRes->DoClose();
}
//AMLOEXT-208
-void ScOpenclTest::testStatisticalFormulaCountA()
+void ScOpenCLTest::testStatisticalFormulaCountA()
{
if (!detectOpenCLDevice())
return;
@@ -4552,7 +4552,7 @@ void ScOpenclTest::testStatisticalFormulaCountA()
}
//[AMLOEXT-213]
-void ScOpenclTest::testStatisticalFormulaMaxa()
+void ScOpenCLTest::testStatisticalFormulaMaxa()
{
if (!detectOpenCLDevice())
return;
@@ -4573,7 +4573,7 @@ void ScOpenclTest::testStatisticalFormulaMaxa()
}
//[AMLOEXT-214]
-void ScOpenclTest::testMathFormulaSumProduct()
+void ScOpenCLTest::testMathFormulaSumProduct()
{
if (!detectOpenCLDevice())
return;
@@ -4607,7 +4607,7 @@ void ScOpenclTest::testMathFormulaSumProduct()
xDocShRes->DoClose();
}
//[AMLOEXT-215]
-void ScOpenclTest::testMathFormulaAverageIf()
+void ScOpenCLTest::testMathFormulaAverageIf()
{
if (!detectOpenCLDevice())
return;
@@ -4627,7 +4627,7 @@ void ScOpenclTest::testMathFormulaAverageIf()
xDocShRes->DoClose();
}
//[AMLOEXT-216]
-void ScOpenclTest::testStatisticalFormulaAverageA()
+void ScOpenCLTest::testStatisticalFormulaAverageA()
{
if (!detectOpenCLDevice())
return;
@@ -4647,7 +4647,7 @@ void ScOpenclTest::testStatisticalFormulaAverageA()
xDocShRes->DoClose();
}
//[AMLOEXT-217]
-void ScOpenclTest:: testLogicalFormulaAnd()
+void ScOpenCLTest:: testLogicalFormulaAnd()
{
if (!detectOpenCLDevice())
return;
@@ -4673,7 +4673,7 @@ void ScOpenclTest:: testLogicalFormulaAnd()
xDocShRes->DoClose();
}
//[AMLOEXT-218]
-void ScOpenclTest::testStatisticalFormulaVarA()
+void ScOpenCLTest::testStatisticalFormulaVarA()
{
if (!detectOpenCLDevice())
return;
@@ -4696,7 +4696,7 @@ void ScOpenclTest::testStatisticalFormulaVarA()
xDocShRes->DoClose();
}
//[AMLOEXT-219]
-void ScOpenclTest::testStatisticalFormulaVarPA()
+void ScOpenCLTest::testStatisticalFormulaVarPA()
{
if (!detectOpenCLDevice())
return;
@@ -4719,7 +4719,7 @@ void ScOpenclTest::testStatisticalFormulaVarPA()
xDocShRes->DoClose();
}
//[AMLOEXT-220]
-void ScOpenclTest::testStatisticalFormulaStDevA()
+void ScOpenCLTest::testStatisticalFormulaStDevA()
{
if (!detectOpenCLDevice())
return;
@@ -4742,7 +4742,7 @@ void ScOpenclTest::testStatisticalFormulaStDevA()
xDocShRes->DoClose();
}
//[AMLOEXT-221]
-void ScOpenclTest::testStatisticalFormulaStDevPA()
+void ScOpenCLTest::testStatisticalFormulaStDevPA()
{
if (!detectOpenCLDevice())
return;
@@ -4765,7 +4765,7 @@ void ScOpenclTest::testStatisticalFormulaStDevPA()
xDocShRes->DoClose();
}
//[AMLOEXT-223]
-void ScOpenclTest:: testFinancialMDurationFormula1()
+void ScOpenCLTest:: testFinancialMDurationFormula1()
{
if (!detectOpenCLDevice())
return;
@@ -4785,7 +4785,7 @@ void ScOpenclTest:: testFinancialMDurationFormula1()
xDocShRes->DoClose();
}
//[AMLOEXT-245]
-void ScOpenclTest::testMathFormulaSumProduct2()
+void ScOpenCLTest::testMathFormulaSumProduct2()
{
if (!detectOpenCLDevice())
return;
@@ -4807,7 +4807,7 @@ void ScOpenclTest::testMathFormulaSumProduct2()
}
//[AMLOEXT-243]
-void ScOpenclTest:: testStatisticalParallelCountBug()
+void ScOpenCLTest:: testStatisticalParallelCountBug()
{
if (!detectOpenCLDevice())
return;
@@ -4829,7 +4829,7 @@ void ScOpenclTest:: testStatisticalParallelCountBug()
xDocShRes->DoClose();
}
//[AMLOEXT-264]
-void ScOpenclTest:: testLogicalFormulaOr()
+void ScOpenCLTest:: testLogicalFormulaOr()
{
if (!detectOpenCLDevice())
return;
@@ -4849,7 +4849,7 @@ void ScOpenclTest:: testLogicalFormulaOr()
xDocShRes->DoClose();
}
//[AMLOEXT-267]
-void ScOpenclTest:: testLogicalFormulaNot()
+void ScOpenCLTest:: testLogicalFormulaNot()
{
if (!detectOpenCLDevice())
return;
@@ -4869,7 +4869,7 @@ void ScOpenclTest:: testLogicalFormulaNot()
xDocShRes->DoClose();
}
//[AMLOEXT-272]
-void ScOpenclTest:: testLogicalFormulaXor()
+void ScOpenCLTest:: testLogicalFormulaXor()
{
if (!detectOpenCLDevice())
return;
@@ -4889,7 +4889,7 @@ void ScOpenclTest:: testLogicalFormulaXor()
xDocShRes->DoClose();
}
//[AMLOEXT-333]
-void ScOpenclTest::testDatabaseFormulaDcount()
+void ScOpenCLTest::testDatabaseFormulaDcount()
{
if (!detectOpenCLDevice())
return;
@@ -4910,7 +4910,7 @@ void ScOpenclTest::testDatabaseFormulaDcount()
xDocShRes->DoClose();
}
//[AMLOEXT-334]
-void ScOpenclTest::testDatabaseFormulaDcountA()
+void ScOpenCLTest::testDatabaseFormulaDcountA()
{
if (!detectOpenCLDevice())
return;
@@ -4931,7 +4931,7 @@ void ScOpenclTest::testDatabaseFormulaDcountA()
xDocShRes->DoClose();
}
//[AMLOEXT-335]
-void ScOpenclTest::testDatabaseFormulaDmax()
+void ScOpenCLTest::testDatabaseFormulaDmax()
{
if (!detectOpenCLDevice())
return;
@@ -4953,7 +4953,7 @@ void ScOpenclTest::testDatabaseFormulaDmax()
}
//[AMLOEXT-336]
-void ScOpenclTest::testDatabaseFormulaDmin()
+void ScOpenCLTest::testDatabaseFormulaDmin()
{
if (!detectOpenCLDevice())
return;
@@ -4975,7 +4975,7 @@ void ScOpenclTest::testDatabaseFormulaDmin()
}
//[AMLOEXT-337]
-void ScOpenclTest::testDatabaseFormulaDproduct()
+void ScOpenCLTest::testDatabaseFormulaDproduct()
{
if (!detectOpenCLDevice())
return;
@@ -4997,7 +4997,7 @@ void ScOpenclTest::testDatabaseFormulaDproduct()
}
//[AMLOEXT-338]
-void ScOpenclTest::testDatabaseFormulaDaverage()
+void ScOpenCLTest::testDatabaseFormulaDaverage()
{
if (!detectOpenCLDevice())
return;
@@ -5020,7 +5020,7 @@ void ScOpenclTest::testDatabaseFormulaDaverage()
}
//[AMLOEXT-339]
-void ScOpenclTest::testDatabaseFormulaDstdev()
+void ScOpenCLTest::testDatabaseFormulaDstdev()
{
if (!detectOpenCLDevice())
return;
@@ -5043,7 +5043,7 @@ void ScOpenclTest::testDatabaseFormulaDstdev()
}
//[AMLOEXT-340]
-void ScOpenclTest::testDatabaseFormulaDstdevp()
+void ScOpenCLTest::testDatabaseFormulaDstdevp()
{
if (!detectOpenCLDevice())
return;
@@ -5066,7 +5066,7 @@ void ScOpenclTest::testDatabaseFormulaDstdevp()
}
//[AMLOEXT-341]
-void ScOpenclTest::testDatabaseFormulaDsum()
+void ScOpenCLTest::testDatabaseFormulaDsum()
{
if (!detectOpenCLDevice())
return;
@@ -5089,7 +5089,7 @@ void ScOpenclTest::testDatabaseFormulaDsum()
}
//[AMLOEXT-342]
-void ScOpenclTest::testDatabaseFormulaDvar()
+void ScOpenCLTest::testDatabaseFormulaDvar()
{
if (!detectOpenCLDevice())
return;
@@ -5112,7 +5112,7 @@ void ScOpenclTest::testDatabaseFormulaDvar()
}
//[AMLOEXT-343]
-void ScOpenclTest::testDatabaseFormulaDvarp()
+void ScOpenCLTest::testDatabaseFormulaDvarp()
{
if (!detectOpenCLDevice())
return;
@@ -5133,7 +5133,7 @@ void ScOpenclTest::testDatabaseFormulaDvarp()
xDocShRes->DoClose();
}
//[AMLOEXT-351]
-void ScOpenclTest::testMathFormulaRoundUp()
+void ScOpenCLTest::testMathFormulaRoundUp()
{
if (!detectOpenCLDevice())
return;
@@ -5154,7 +5154,7 @@ void ScOpenclTest::testMathFormulaRoundUp()
xDocShRes->DoClose();
}
//[ AMLOEXT-352]
-void ScOpenclTest::testMathFormulaRoundDown()
+void ScOpenCLTest::testMathFormulaRoundDown()
{
if (!detectOpenCLDevice())
return;
@@ -5175,7 +5175,7 @@ void ScOpenclTest::testMathFormulaRoundDown()
xDocShRes->DoClose();
}
//[ AMLOEXT-353]
-void ScOpenclTest::testMathFormulaInt()
+void ScOpenCLTest::testMathFormulaInt()
{
if (!detectOpenCLDevice())
return;
@@ -5196,7 +5196,7 @@ void ScOpenclTest::testMathFormulaInt()
xDocShRes->DoClose();
}
//[ AMLOEXT-354]
-void ScOpenclTest::testMathFormulaRadians()
+void ScOpenCLTest::testMathFormulaRadians()
{
if (!detectOpenCLDevice())
return;
@@ -5217,7 +5217,7 @@ void ScOpenclTest::testMathFormulaRadians()
xDocShRes->DoClose();
}
//AMLOEXT-356
-void ScOpenclTest::testMathFormulaDegrees()
+void ScOpenCLTest::testMathFormulaDegrees()
{
if (!detectOpenCLDevice())
return;
@@ -5237,7 +5237,7 @@ void ScOpenclTest::testMathFormulaDegrees()
xDocShRes->DoClose();
}
//[ AMLOEXT-357]
-void ScOpenclTest::testMathFormulaIsEven()
+void ScOpenCLTest::testMathFormulaIsEven()
{
if (!detectOpenCLDevice())
return;
@@ -5258,7 +5258,7 @@ void ScOpenclTest::testMathFormulaIsEven()
xDocShRes->DoClose();
}
//[AMLOEXT-360]
-void ScOpenclTest::testMathFormulaCountIf()
+void ScOpenCLTest::testMathFormulaCountIf()
{
if (!detectOpenCLDevice())
return;
@@ -5278,7 +5278,7 @@ void ScOpenclTest::testMathFormulaCountIf()
xDocShRes->DoClose();
}
//[ AMLOEXT-361]
-void ScOpenclTest::testMathFormulaIsOdd()
+void ScOpenCLTest::testMathFormulaIsOdd()
{
if (!detectOpenCLDevice())
return;
@@ -5299,7 +5299,7 @@ void ScOpenclTest::testMathFormulaIsOdd()
xDocShRes->DoClose();
}
//[AMLOEXT-362]
-void ScOpenclTest::testMathFormulaFact()
+void ScOpenCLTest::testMathFormulaFact()
{
if (!detectOpenCLDevice())
return;
@@ -5319,7 +5319,7 @@ void ScOpenclTest::testMathFormulaFact()
xDocShRes->DoClose();
}
//AMLOEXT-367
-void ScOpenclTest::testMathFormulaSEC()
+void ScOpenCLTest::testMathFormulaSEC()
{
if (!detectOpenCLDevice())
return;
@@ -5340,7 +5340,7 @@ void ScOpenclTest::testMathFormulaSEC()
xDocShRes->DoClose();
}
//AMLOEXT-368
-void ScOpenclTest::testMathFormulaSECH()
+void ScOpenCLTest::testMathFormulaSECH()
{
if (!detectOpenCLDevice())
return;
@@ -5361,7 +5361,7 @@ void ScOpenclTest::testMathFormulaSECH()
xDocShRes->DoClose();
}
//AMLOEXT-369
-void ScOpenclTest::testMathFormulaMROUND()
+void ScOpenCLTest::testMathFormulaMROUND()
{
if (!detectOpenCLDevice())
return;
@@ -5382,7 +5382,7 @@ void ScOpenclTest::testMathFormulaMROUND()
xDocShRes->DoClose();
}
//[AMLOEXT-372]
-void ScOpenclTest::testMathFormulaQuotient()
+void ScOpenCLTest::testMathFormulaQuotient()
{
if (!detectOpenCLDevice())
return;
@@ -5403,7 +5403,7 @@ void ScOpenclTest::testMathFormulaQuotient()
xDocShRes->DoClose();
}
//[AMLOEXT-373]
-void ScOpenclTest::testMathFormulaSeriesSum()
+void ScOpenCLTest::testMathFormulaSeriesSum()
{
if (!detectOpenCLDevice())
return;
@@ -5423,7 +5423,7 @@ void ScOpenclTest::testMathFormulaSeriesSum()
xDocShRes->DoClose();
}
//[AMLOEXT-377]
-void ScOpenclTest::testMathFormulaSumIf()
+void ScOpenCLTest::testMathFormulaSumIf()
{
if (!detectOpenCLDevice())
return;
@@ -5443,7 +5443,7 @@ void ScOpenclTest::testMathFormulaSumIf()
xDocShRes->DoClose();
}
//[AMLOEXT-378]
-void ScOpenclTest::testAddInFormulaBesseLJ()
+void ScOpenCLTest::testAddInFormulaBesseLJ()
{
if (!detectOpenCLDevice())
return;
@@ -5466,7 +5466,7 @@ void ScOpenclTest::testAddInFormulaBesseLJ()
xDocShRes->DoClose();
}
//AMLOEXT-379
-void ScOpenclTest::testStatisticalFormulaAvedev()
+void ScOpenCLTest::testStatisticalFormulaAvedev()
{
if (!detectOpenCLDevice())
return;
@@ -5489,7 +5489,7 @@ void ScOpenclTest::testStatisticalFormulaAvedev()
}
//[AMLOEXT-383]
-void ScOpenclTest::testNegSub()
+void ScOpenCLTest::testNegSub()
{
if (!detectOpenCLDevice())
return;
@@ -5512,7 +5512,7 @@ void ScOpenclTest::testNegSub()
xDocShRes->DoClose();
}
//[AMLOEXT-386]
-void ScOpenclTest::testMathFormulaAverageIf_Mix()
+void ScOpenCLTest::testMathFormulaAverageIf_Mix()
{
if (!detectOpenCLDevice())
return;
@@ -5532,7 +5532,7 @@ void ScOpenclTest::testMathFormulaAverageIf_Mix()
xDocShRes->DoClose();
}
//[AMLOEXT-387]
-void ScOpenclTest::testStatisticalFormulaKurt1()
+void ScOpenCLTest::testStatisticalFormulaKurt1()
{
if (!detectOpenCLDevice())
return;
@@ -5553,7 +5553,7 @@ void ScOpenclTest::testStatisticalFormulaKurt1()
xDocShRes->DoClose();
}
//[AMLOEXT-401]
-void ScOpenclTest::testStatisticalFormulaHarMean1()
+void ScOpenCLTest::testStatisticalFormulaHarMean1()
{
if (!detectOpenCLDevice())
return;
@@ -5574,7 +5574,7 @@ void ScOpenclTest::testStatisticalFormulaHarMean1()
xDocShRes->DoClose();
}
//[AMLOEXT-402]
-void ScOpenclTest::testStatisticalFormulaVarA1()
+void ScOpenCLTest::testStatisticalFormulaVarA1()
{
if (!detectOpenCLDevice())
return;
@@ -5597,7 +5597,7 @@ void ScOpenclTest::testStatisticalFormulaVarA1()
xDocShRes->DoClose();
}
//[AMLOEXT-403]
-void ScOpenclTest::testStatisticalFormulaVarPA1()
+void ScOpenCLTest::testStatisticalFormulaVarPA1()
{
if (!detectOpenCLDevice())
return;
@@ -5620,7 +5620,7 @@ void ScOpenclTest::testStatisticalFormulaVarPA1()
xDocShRes->DoClose();
}
//[AMLOEXT-404]
-void ScOpenclTest::testStatisticalFormulaStDevA1()
+void ScOpenCLTest::testStatisticalFormulaStDevA1()
{
if (!detectOpenCLDevice())
return;
@@ -5643,7 +5643,7 @@ void ScOpenclTest::testStatisticalFormulaStDevA1()
xDocShRes->DoClose();
}
//[AMLOEXT-405]
-void ScOpenclTest::testStatisticalFormulaStDevPA1()
+void ScOpenCLTest::testStatisticalFormulaStDevPA1()
{
if (!detectOpenCLDevice())
return;
@@ -5665,12 +5665,12 @@ void ScOpenclTest::testStatisticalFormulaStDevPA1()
xDocSh->DoClose();
xDocShRes->DoClose();
}
-ScOpenclTest::ScOpenclTest()
+ScOpenCLTest::ScOpenCLTest()
: ScBootstrapFixture( "/sc/qa/unit/data" )
{
}
-void ScOpenclTest::setUp()
+void ScOpenCLTest::setUp()
{
test::BootstrapFixture::setUp();
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
@@ -5681,14 +5681,14 @@ void ScOpenclTest::setUp()
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
-void ScOpenclTest::tearDown()
+void ScOpenCLTest::tearDown()
{
uno::Reference< lang::XComponent >
( m_xCalcComponent, UNO_QUERY_THROW )->dispose();
test::BootstrapFixture::tearDown();
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScOpenclTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScOpenCLTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 1b3dc09..2818af1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -95,7 +95,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, cl_program )
}
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
if (pHostBuffer)
{
@@ -186,7 +186,7 @@ public:
// marshaling
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
// Pass the scalar result back to the rest of the formula kernel
cl_int err = clSetKernelArg(k, argno, sizeof(cl_uint), (void*)&hashCode);
if (CL_SUCCESS != err)
@@ -370,7 +370,7 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, cl_pro
FormulaToken* ref = mFormulaTree->GetFormulaToken();
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
formula::VectorRefArray vRef;
size_t nStrings = 0;
@@ -1113,7 +1113,7 @@ public:
assert(Base::mpClmem == NULL);
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
size_t nInput = mpDVR->GetArrayLength();
size_t nCurWindowSize = mpDVR->GetRefRowSize();
@@ -1894,7 +1894,7 @@ public:
{
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
cl_mem pClmem2;
@@ -1952,7 +1952,7 @@ public:
{
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
DynamicKernelArgument* Arg = mvSubArguments[0].get();
DynamicKernelSlidingArgument<VectorRef>* slidingArgPtr =
@@ -3260,11 +3260,11 @@ public:
DynamicKernelSoPArguments>(mpRoot, new OpNop);
std::stringstream decl;
- if (OpenclDevice::gpuEnv.mnKhrFp64Flag)
+ if (OpenCLDevice::gpuEnv.mnKhrFp64Flag)
{
decl << "#pragma OPENCL EXTENSION cl_khr_fp64: enable\n";
}
- else if (OpenclDevice::gpuEnv.mnAmdFp64Flag)
+ else if (OpenCLDevice::gpuEnv.mnAmdFp64Flag)
{
decl << "#pragma OPENCL EXTENSION cl_amd_fp64: enable\n";
}
@@ -3326,7 +3326,7 @@ public:
{
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
cl_int err;
// The results
mpResClmem = clCreateBuffer(kEnv.mpkContext,
@@ -3388,7 +3388,7 @@ void DynamicKernel::CreateKernel()
// Compile kernel here!!!
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
const char* src = mFullProgramSrc.c_str();
static std::string lastOneKernelHash = "";
static std::string lastSecondKernelHash = "";
@@ -3410,11 +3410,11 @@ void DynamicKernel::CreateKernel()
{
clReleaseProgram(lastSecondProgram);
}
- if (OpenclDevice::buildProgramFromBinary("",
- &OpenclDevice::gpuEnv, KernelHash.c_str(), 0))
+ if (OpenCLDevice::buildProgramFromBinary("",
+ &OpenCLDevice::gpuEnv, KernelHash.c_str(), 0))
{
- mpProgram = OpenclDevice::gpuEnv.mpArryPrograms[0];
- OpenclDevice::gpuEnv.mpArryPrograms[0] = NULL;
+ mpProgram = OpenCLDevice::gpuEnv.mpArryPrograms[0];
+ OpenCLDevice::gpuEnv.mpArryPrograms[0] = NULL;
}
else
{
@@ -3423,7 +3423,7 @@ void DynamicKernel::CreateKernel()
if (err != CL_SUCCESS)
throw OpenCLError(err, __FILE__, __LINE__);
err = clBuildProgram(mpProgram, 1,
- OpenclDevice::gpuEnv.mpArryDevsID, "", NULL, NULL);
+ OpenCLDevice::gpuEnv.mpArryDevsID, "", NULL, NULL);
if (err != CL_SUCCESS)
{
#if OSL_DEBUG_LEVEL > 0
@@ -3431,7 +3431,7 @@ void DynamicKernel::CreateKernel()
{
cl_build_status stat;
cl_int e = clGetProgramBuildInfo(
- mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0],
+ mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0],
CL_PROGRAM_BUILD_STATUS, sizeof(cl_build_status),
&stat, 0);
SAL_WARN_IF(
@@ -3443,7 +3443,7 @@ void DynamicKernel::CreateKernel()
{
size_t n;
e = clGetProgramBuildInfo(
- mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0],
+ mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0],
CL_PROGRAM_BUILD_LOG, 0, 0, &n);
SAL_WARN_IF(
e != CL_SUCCESS || n == 0, "sc.opencl",
@@ -3454,7 +3454,7 @@ void DynamicKernel::CreateKernel()
{
std::vector<char> log(n);
e = clGetProgramBuildInfo(
- mpProgram, OpenclDevice::gpuEnv.mpArryDevsID[0],
+ mpProgram, OpenCLDevice::gpuEnv.mpArryDevsID[0],
CL_PROGRAM_BUILD_LOG, n, &log[0], 0);
SAL_WARN_IF(
e != CL_SUCCESS || n == 0, "sc.opencl",
@@ -3473,7 +3473,7 @@ void DynamicKernel::CreateKernel()
throw OpenCLError(err, __FILE__, __LINE__);
}
// Generate binary out of compiled kernel.
- OpenclDevice::generatBinFromKernelSource(mpProgram,
+ OpenCLDevice::generatBinFromKernelSource(mpProgram,
(mKernelSignature + GetMD5()).c_str());
}
lastSecondKernelHash = lastOneKernelHash;
@@ -3661,7 +3661,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
{
// Obtain cl context
KernelEnv kEnv;
- OpenclDevice::setKernelEnv(&kEnv);
+ OpenCLDevice::setKernelEnv(&kEnv);
// Run the kernel.
pKernel->Launch(xGroup->mnLength);
// Map results back
@@ -3744,20 +3744,20 @@ SAL_DLLPUBLIC_EXPORT size_t getOpenCLPlatformCount()
}
SAL_DLLPUBLIC_EXPORT void SAL_CALL fillOpenCLInfo(
- sc::OpenclPlatformInfo* pInfos, size_t nInfoSize )
+ sc::OpenCLPlatformInfo* pInfos, size_t nInfoSize )
{
- const std::vector<sc::OpenclPlatformInfo>& rPlatforms =
+ const std::vector<sc::OpenCLPlatformInfo>& rPlatforms =
sc::opencl::fillOpenCLInfo();
size_t n = std::min(rPlatforms.size(), nInfoSize);
for (size_t i = 0; i < n; ++i)
pInfos[i] = rPlatforms[i];
}
-SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice(
+SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenCLDevice(
const OUString* pDeviceId, bool bAutoSelect,
bool bForceEvaluation )
{
- return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect, bForceEvaluation);
+ return sc::opencl::switchOpenCLDevice(pDeviceId, bAutoSelect, bForceEvaluation);
}
SAL_DLLPUBLIC_EXPORT void SAL_CALL getOpenCLDeviceInfo( size_t* pDeviceId, size_t* pPlatformId )
diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index 79e7925..629ccaa 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -43,8 +43,8 @@ using namespace std;
namespace sc { namespace opencl {
-GPUEnv OpenclDevice::gpuEnv;
-bool OpenclDevice::bIsInited = false;
+GPUEnv OpenCLDevice::gpuEnv;
+bool OpenCLDevice::bIsInited = false;
namespace {
@@ -87,7 +87,7 @@ void clearCache()
// more. So there is little this function can do until we come up
// with some other way to figure out which cached .bin files are
// "current".
- OUString aCacheDirURL(rtl::OStringToOUString(OpenclDevice::maCacheFolder, RTL_TEXTENCODING_UTF8));
+ OUString aCacheDirURL(rtl::OStringToOUString(OpenCLDevice::maCacheFolder, RTL_TEXTENCODING_UTF8));
osl::Directory aCacheDir(aCacheDirURL);
osl::FileBase::RC status = aCacheDir.open();
if(status != osl::FileBase::E_None)
@@ -117,15 +117,15 @@ void clearCache()
}
-OString OpenclDevice::maCacheFolder = getCacheFolder();
+OString OpenCLDevice::maCacheFolder = getCacheFolder();
-void OpenclDevice::registOpenclKernel()
+void OpenCLDevice::registerOpenCLKernel()
{
if ( !gpuEnv.mnIsUserCreated )
memset( &gpuEnv, 0, sizeof(gpuEnv) );
}
-void OpenclDevice::setKernelEnv( KernelEnv *envInfo )
+void OpenCLDevice::setKernelEnv( KernelEnv *envInfo )
{
envInfo->mpkContext = gpuEnv.mpContext;
envInfo->mpkCmdQueue = gpuEnv.mpCmdQueue;
@@ -161,13 +161,13 @@ OString createFileName(cl_device_id deviceId, const char* clFileName)
OString aString = OString(deviceName) + driverVersion + platformVersion;
OString aHash = generateMD5(aString.getStr(), aString.getLength());
- return OpenclDevice::maCacheFolder + fileName + "-" +
+ return OpenCLDevice::maCacheFolder + fileName + "-" +
aHash + ".bin";
}
}
-std::vector<boost::shared_ptr<osl::File> > OpenclDevice::binaryGenerated( const char * clFileName, cl_context context )
+std::vector<boost::shared_ptr<osl::File> > OpenCLDevice::binaryGenerated( const char * clFileName, cl_context context )
{
size_t numDevices=0;
@@ -210,7 +210,7 @@ std::vector<boost::shared_ptr<osl::File> > OpenclDevice::binaryGenerated( const
return aGeneratedFiles;
}
-bool OpenclDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes )
+bool OpenCLDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes )
{
clearCache();
osl::File file(rtl::OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8));
@@ -228,7 +228,7 @@ bool OpenclDevice::writeBinaryToFile( const OString& rFileName, const char* bina
return true;
}
-bool OpenclDevice::generatBinFromKernelSource( cl_program program, const char * clFileName )
+bool OpenCLDevice::generatBinFromKernelSource( cl_program program, const char * clFileName )
{
cl_uint numDevices;
@@ -292,7 +292,7 @@ bool OpenclDevice::generatBinFromKernelSource( cl_program program, const char *
return true;
}
-bool OpenclDevice::initOpenclAttr( OpenCLEnv * env )
+bool OpenCLDevice::initOpenCLAttr( OpenCLEnv * env )
{
if ( gpuEnv.mnIsUserCreated )
return true;
@@ -307,7 +307,7 @@ bool OpenclDevice::initOpenclAttr( OpenCLEnv * env )
return false;
}
-void OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo )
+void OpenCLDevice::releaseOpenCLEnv( GPUEnv *gpuInfo )
{
if ( !bIsInited )
{
@@ -383,7 +383,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx)
return false;
}
- OString aBuildLogFileURL = OpenclDevice::maCacheFolder + "kernel-build.log";
+ OString aBuildLogFileURL = OpenCLDevice::maCacheFolder + "kernel-build.log";
osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8));
osl::FileBase::RC status = aBuildLogFile.open(
osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
@@ -402,7 +402,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx)
}
-bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char* filename, int idx)
+bool OpenCLDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char* filename, int idx)
{
size_t numDevices;
cl_int clStatus = clGetContextInfo( gpuInfo->mpContext, CL_CONTEXT_DEVICES,
@@ -469,7 +469,7 @@ bool OpenclDevice::buildProgramFromBinary(const char* buildOption, GPUEnv* gpuIn
return buildProgram(buildOption, gpuInfo, idx);
}
-bool OpenclDevice::initOpenclRunEnv( int argc )
+bool OpenCLDevice::initOpenCLRunEnv( int argc )
{
if ( MAX_CLKERNEL_NUM <= 0 )
{
@@ -480,9 +480,9 @@ bool OpenclDevice::initOpenclRunEnv( int argc )
if ( !bIsInited )
{
- registOpenclKernel();
+ registerOpenCLKernel();
//initialize devices, context, command_queue
- bool status = initOpenclRunEnv( &gpuEnv );
+ bool status = initOpenCLRunEnv( &gpuEnv );
if ( status )
{
return true;
@@ -546,7 +546,7 @@ void checkDeviceForDoubleSupport(cl_device_id deviceId, bool& bKhrFp64, bool& bA
}
-bool OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
+bool OpenCLDevice::initOpenCLRunEnv( GPUEnv *gpuInfo )
{
size_t length;
cl_int clStatus;
@@ -678,7 +678,7 @@ bool OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
namespace {
// based on crashes and hanging during kernel compilation
-bool checkForKnownBadCompilers(const OpenclDeviceInfo& rInfo)
+bool checkForKnownBadCompilers(const OpenCLDeviceInfo& rInfo)
{
struct {
@@ -697,9 +697,9 @@ bool checkForKnownBadCompilers(const OpenclDeviceInfo& rInfo)
return false;
}
-void createDeviceInfo(cl_device_id aDeviceId, OpenclPlatformInfo& rPlatformInfo)
+void createDeviceInfo(cl_device_id aDeviceId, OpenCLPlatformInfo& rPlatformInfo)
{
- OpenclDeviceInfo aDeviceInfo;
+ OpenCLDeviceInfo aDeviceInfo;
aDeviceInfo.device = aDeviceId;
char pName[DEVICE_NAME_LENGTH];
@@ -757,7 +757,7 @@ void createDeviceInfo(cl_device_id aDeviceId, OpenclPlatformInfo& rPlatformInfo)
rPlatformInfo.maDevices.push_back(aDeviceInfo);
}
-bool createPlatformInfo(cl_platform_id nPlatformId, OpenclPlatformInfo& rPlatformInfo)
+bool createPlatformInfo(cl_platform_id nPlatformId, OpenCLPlatformInfo& rPlatformInfo)
{
rPlatformInfo.platform = nPlatformId;
char pName[64];
@@ -812,9 +812,9 @@ size_t getOpenCLPlatformCount()
return nPlatforms;
}
-const std::vector<OpenclPlatformInfo>& fillOpenCLInfo()
+const std::vector<OpenCLPlatformInfo>& fillOpenCLInfo()
{
- static std::vector<OpenclPlatformInfo> aPlatforms;
+ static std::vector<OpenCLPlatformInfo> aPlatforms;
if(!aPlatforms.empty())
return aPlatforms;
@@ -838,7 +838,7 @@ const std::vector<OpenclPlatformInfo>& fillOpenCLInfo()
for(size_t i = 0; i < nPlatforms; ++i)
{
- OpenclPlatformInfo aPlatformInfo;
+ OpenCLPlatformInfo aPlatformInfo;
if(createPlatformInfo(pPlatforms[i], aPlatformInfo))
aPlatforms.push_back(aPlatformInfo);
}
@@ -848,12 +848,12 @@ const std::vector<OpenclPlatformInfo>& fillOpenCLInfo()
namespace {
-cl_device_id findDeviceIdByDeviceString(const OUString& rString, const std::vector<OpenclPlatformInfo>& rPlatforms)
+cl_device_id findDeviceIdByDeviceString(const OUString& rString, const std::vector<OpenCLPlatformInfo>& rPlatforms)
{
- std::vector<OpenclPlatformInfo>::const_iterator it = rPlatforms.begin(), itEnd = rPlatforms.end();
+ std::vector<OpenCLPlatformInfo>::const_iterator it = rPlatforms.begin(), itEnd = rPlatforms.end();
for(; it != itEnd; ++it)
{
- std::vector<OpenclDeviceInfo>::const_iterator itr = it->maDevices.begin(), itrEnd = it->maDevices.end();
+ std::vector<OpenCLDeviceInfo>::const_iterator itr = it->maDevices.begin(), itrEnd = it->maDevices.end();
for(; itr != itrEnd; ++itr)
{
OUString aDeviceId = it->maVendor + " " + itr->maName;
@@ -876,7 +876,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_
if(nState != CL_SUCCESS)
return;
- const std::vector<OpenclPlatformInfo>& rPlatforms = fillOpenCLInfo();
+ const std::vector<OpenCLPlatformInfo>& rPlatforms = fillOpenCLInfo();
for(size_t i = 0; i < rPlatforms.size(); ++i)
{
cl_platform_id platId = static_cast<cl_platform_id>(rPlatforms[i].platform);
@@ -898,7 +898,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_
}
-bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation)
+bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation)
{
if(fillOpenCLInfo().empty())
return false;
@@ -923,7 +923,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv
}
- if(OpenclDevice::gpuEnv.mpDevID == pDeviceId)
+ if(OpenCLDevice::gpuEnv.mpDevID == pDeviceId)
{
// we don't need to change anything
// still the same device
@@ -962,18 +962,18 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv
return false;
}
- OpenclDevice::releaseOpenclEnv(&OpenclDevice::gpuEnv);
+ OpenCLDevice::releaseOpenCLEnv(&OpenCLDevice::gpuEnv);
OpenCLEnv env;
env.mpOclPlatformID = platformId;
env.mpOclContext = context;
env.mpOclDevsID = pDeviceId;
env.mpOclCmdQueue = command_queue;
- OpenclDevice::initOpenclAttr(&env);
+ OpenCLDevice::initOpenCLAttr(&env);
// why do we need this at all?
- OpenclDevice::gpuEnv.mpArryDevsID = (cl_device_id*) malloc( sizeof(cl_device_id) );
- OpenclDevice::gpuEnv.mpArryDevsID[0] = pDeviceId;
- return !OpenclDevice::initOpenclRunEnv(0);
+ OpenCLDevice::gpuEnv.mpArryDevsID = (cl_device_id*) malloc( sizeof(cl_device_id) );
+ OpenCLDevice::gpuEnv.mpArryDevsID[0] = pDeviceId;
+ return !OpenCLDevice::initOpenCLRunEnv(0);
}
void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId)
@@ -982,7 +982,7 @@ void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId)
if (status < 0)
return;
- cl_device_id id = OpenclDevice::gpuEnv.mpDevID;
+ cl_device_id id = OpenCLDevice::gpuEnv.mpDevID;
findDeviceInfoFromDeviceId(id, rDeviceId, rPlatformId);
}
diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx
index ff8c2f6..ab3e233 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -147,28 +147,28 @@ struct DoubleVectorFormula
int mnInputEndOffset;
};
-class OpenclDevice
+class OpenCLDevice
{
public:
static GPUEnv gpuEnv;
static bool bIsInited;
static OString maCacheFolder;
- static void registOpenclKernel();
- static bool initOpenclRunEnv( GPUEnv *gpu );
- static void releaseOpenclEnv( GPUEnv *gpuInfo );
- static bool initOpenclRunEnv( int argc );
+ static void registerOpenCLKernel();
+ static bool initOpenCLRunEnv( GPUEnv *gpu );
+ static void releaseOpenCLEnv( GPUEnv *gpuInfo );
+ static bool initOpenCLRunEnv( int argc );
static bool generatBinFromKernelSource( cl_program program, const char * clFileName );
static bool writeBinaryToFile( const OString& rName, const char* birary, size_t numBytes );
static std::vector<boost::shared_ptr<osl::File> > binaryGenerated( const char * clFileName, cl_context context);
static bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuEnv, const char* filename, int idx);
- static bool initOpenclAttr( OpenCLEnv * env );
+ static bool initOpenCLAttr( OpenCLEnv * env );
static void setKernelEnv( KernelEnv *envInfo );
};
size_t getOpenCLPlatformCount();
-const std::vector<OpenclPlatformInfo>& fillOpenCLInfo();
+const std::vector<OpenCLPlatformInfo>& fillOpenCLInfo();
/**
* Used to set or switch between OpenCL devices.
@@ -178,7 +178,7 @@ const std::vector<OpenclPlatformInfo>& fillOpenCLInfo();
*
* @return returns true if there is a valid opencl device that has been set up
*/
-bool switchOpenclDevice(const OUString* pDeviceId, bool bAutoSelect,
+bool switchOpenCLDevice(const OUString* pDeviceId, bool bAutoSelect,
bool bForceEvaluation);
void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId);
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index a862b0c..1445dd3 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -33,8 +33,8 @@
#ifdef DISABLE_DYNLOADING
extern "C" size_t getOpenCLPlatformCount(void);
-extern "C" void fillOpenCLInfo(sc::OpenclPlatformInfo*, size_t);
-extern "C" bool switchOpenClDevice(const OUString*, bool, bool);
+extern "C" void fillOpenCLInfo(sc::OpenCLPlatformInfo*, size_t);
+extern "C" bool switchOpenCLDevice(const OUString*, bool, bool);
extern "C" sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter();
extern "C" void getOpenCLDeviceInfo(size_t*, size_t*);
@@ -528,8 +528,8 @@ static void SAL_CALL thisModule() {}
typedef FormulaGroupInterpreter* (*__createFormulaGroupOpenCLInterpreter)(void);
typedef size_t (*__getOpenCLPlatformCount)(void);
-typedef void (*__fillOpenCLInfo)(OpenclPlatformInfo*, size_t);
-typedef bool (*__switchOpenClDevice)(const OUString*, bool, bool);
+typedef void (*__fillOpenCLInfo)(OpenCLPlatformInfo*, size_t);
+typedef bool (*__switchOpenCLDevice)(const OUString*, bool, bool);
typedef void (*__getOpenCLDeviceInfo)(size_t*, size_t*);
#endif
@@ -585,7 +585,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
return msInstance;
}
-void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms)
+void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenCLPlatformInfo>& rPlatforms)
{
#if !HAVE_FEATURE_OPENCL
(void) rPlatforms;
@@ -607,7 +607,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rP
if (!fn)
return;
- std::vector<OpenclPlatformInfo> aPlatforms(nPlatforms);
+ std::vector<OpenCLPlatformInfo> aPlatforms(nPlatforms);
reinterpret_cast<__fillOpenCLInfo>(fn)(&aPlatforms[0], aPlatforms.size());
rPlatforms.swap(aPlatforms);
#else
@@ -615,7 +615,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rP
if (!nPlatforms)
return;
- std::vector<OpenclPlatformInfo> aPlatforms(nPlatforms);
+ std::vector<OpenCLPlatformInfo> aPlatforms(nPlatforms);
::fillOpenCLInfo(&aPlatforms[0], aPlatforms.size());
rPlatforms.swap(aPlatforms);
#endif
@@ -645,15 +645,15 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
if (!pModule)
return false;
- oslGenericFunction fn = pModule->getFunctionSymbol("switchOpenClDevice");
+ oslGenericFunction fn = pModule->getFunctionSymbol("switchOpenCLDevice");
if (!fn)
return false;
- bool bSuccess = reinterpret_cast<__switchOpenClDevice>(fn)(&rDeviceId, bAutoSelect, bForceEvaluation);
+ bool bSuccess = reinterpret_cast<__switchOpenCLDevice>(fn)(&rDeviceId, bAutoSelect, bForceEvaluation);
if(!bSuccess)
return false;
#else
- bool bSuccess = switchOpenClDevice(&rDeviceId, bAutoSelect, bForceEvaluation);
+ bool bSuccess = switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation);
if(!bSuccess)
return false;
#endif
diff --git a/sc/source/core/tool/platforminfo.cxx b/sc/source/core/tool/platforminfo.cxx
index 719fda9..3f90b14 100644
--- a/sc/source/core/tool/platforminfo.cxx
+++ b/sc/source/core/tool/platforminfo.cxx
@@ -12,7 +12,7 @@
namespace sc {
-OpenclDeviceInfo::OpenclDeviceInfo()
+OpenCLDeviceInfo::OpenCLDeviceInfo()
: device(0)
, mnMemory(0)
, mnComputeUnits(0)
@@ -20,7 +20,7 @@ OpenclDeviceInfo::OpenclDeviceInfo()
{
}
-OpenclPlatformInfo::OpenclPlatformInfo()
+OpenCLPlatformInfo::OpenCLPlatformInfo()
: platform(NULL)
{
}
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 12a62b9..34fc04b 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -220,7 +220,7 @@ void ScCalcOptionsDialog::setValueAt(size_t nPos, const OUString &rValue)
#if HAVE_FEATURE_OPENCL
-void ScCalcOptionsDialog::fillOpenclList()
+void ScCalcOptionsDialog::fillOpenCLList()
{
mpOpenclInfoList->SetUpdateMode(false);
mpOpenclInfoList->Clear();
@@ -231,10 +231,10 @@ void ScCalcOptionsDialog::fillOpenclList()
SvTreeListEntry* pSelectedEntry = NULL;
sc::FormulaGroupInterpreter::fillOpenCLInfo(maPlatformInfo);
- for(std::vector<sc::OpenclPlatformInfo>::iterator it = maPlatformInfo.begin(),
+ for(std::vector<sc::OpenCLPlatformInfo>::iterator it = maPlatformInfo.begin(),
itEnd = maPlatformInfo.end(); it != itEnd; ++it)
{
- for(std::vector<sc::OpenclDeviceInfo>::iterator
+ for(std::vector<sc::OpenCLDeviceInfo>::iterator
itr = it->maDevices.begin(), itrEnd = it->maDevices.end(); itr != itrEnd; ++itr)
{
OUString aDeviceId = it->maVendor + " " + itr->maName;
@@ -296,7 +296,7 @@ void ScCalcOptionsDialog::FillOptionsList()
#if HAVE_FEATURE_OPENCL
pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
- fillOpenclList();
+ fillOpenCLList();
mpBtnAutomaticSelectionFalse->Check(!maConfig.mbOpenCLAutoSelect);
mpBtnAutomaticSelectionTrue->Check(maConfig.mbOpenCLAutoSelect);
@@ -412,7 +412,7 @@ void ScCalcOptionsDialog::SelectionChanged()
else
mpOpenclInfoList->GetParent()->Disable();
- OpenclAutomaticSelectionChanged();
+ OpenCLAutomaticSelectionChanged();
}
if ( bValue )
@@ -493,7 +493,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged()
}
}
-void ScCalcOptionsDialog::OpenclAutomaticSelectionChanged()
+void ScCalcOptionsDialog::OpenCLAutomaticSelectionChanged()
{
bool bValue = mpBtnAutomaticSelectionTrue->IsChecked();
if(bValue)
@@ -511,7 +511,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
if(!pEntry)
return;
- sc::OpenclDeviceInfo* pInfo = reinterpret_cast<sc::OpenclDeviceInfo*>(pEntry->GetUserData());
+ sc::OpenCLDeviceInfo* pInfo = reinterpret_cast<sc::OpenCLDeviceInfo*>(pEntry->GetUserData());
if(pInfo)
{
mpFtFrequency->SetText(OUString::number(pInfo->mnFrequency));
@@ -556,7 +556,7 @@ void ScCalcOptionsDialog::RadioValueChanged()
mpOpenclInfoList->GetParent()->Enable();
else
mpOpenclInfoList->GetParent()->Disable();
- OpenclAutomaticSelectionChanged();
+ OpenCLAutomaticSelectionChanged();
break;
}
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnToggleHdl)
IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnAutomaticSelectHdl)
{
- OpenclAutomaticSelectionChanged();
+ OpenCLAutomaticSelectionChanged();
return 0;
}
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index a26b344..adac98a 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -43,10 +43,10 @@ private:
void SelectionChanged();
void ListOptionValueChanged();
void RadioValueChanged();
- void OpenclAutomaticSelectionChanged();
+ void OpenCLAutomaticSelectionChanged();
void SelectedDeviceChanged();
#if HAVE_FEATURE_OPENCL
- void fillOpenclList();
+ void fillOpenCLList();
#endif
OUString toString(formula::FormulaGrammar::AddressConvention eConv) const;
@@ -100,7 +100,7 @@ private:
ScCalcConfig maConfig;
#if HAVE_FEATURE_OPENCL
- std::vector<sc::OpenclPlatformInfo> maPlatformInfo;
+ std::vector<sc::OpenCLPlatformInfo> maPlatformInfo;
#endif
bool mbSelectedEmptyStringAsZero;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index de14652..f553e51 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2364,7 +2364,7 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice )
if(nPlatform < 0 || nDevice < 0)
throw uno::RuntimeException();
- std::vector<sc::OpenclPlatformInfo> aPlatformInfo;
+ std::vector<sc::OpenCLPlatformInfo> aPlatformInfo;
sc::FormulaGroupInterpreter::fillOpenCLInfo(aPlatformInfo);
if(size_t(nPlatform) >= aPlatformInfo.size())
throw uno::RuntimeException();
@@ -2397,7 +2397,7 @@ sal_Int32 ScModelObj::getDeviceID()
uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms()
throw (uno::RuntimeException, std::exception)
{
- std::vector<sc::OpenclPlatformInfo> aPlatformInfo;
+ std::vector<sc::OpenCLPlatformInfo> aPlatformInfo;
sc::FormulaGroupInterpreter::fillOpenCLInfo(aPlatformInfo);
uno::Sequence<sheet::opencl::OpenCLPlatform> aRet(aPlatformInfo.size());
@@ -2409,7 +2409,7 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms()
aRet[i].Devices.realloc(aPlatformInfo[i].maDevices.size());
for(size_t j = 0; j < aPlatformInfo[i].maDevices.size(); ++j)
{
- const sc::OpenclDeviceInfo& rDevice = aPlatformInfo[i].maDevices[j];
+ const sc::OpenCLDeviceInfo& rDevice = aPlatformInfo[i].maDevices[j];
aRet[i].Devices[j].Name = rDevice.maName;
aRet[i].Devices[j].Vendor = rDevice.maVendor;
aRet[i].Devices[j].Driver = rDevice.maDriver;
commit 6c9cebe420b876fc35545136bcf2047138f9d7a1
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Oct 3 15:00:57 2014 -0400
Let's not omit 'virtual' keyword here.
Change-Id: Idf4ccbb6415852325acab673a3d81f758e50c880
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index d794e42..1b3dc09 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -307,7 +307,7 @@ public:
{
return mSymName + "_Random()";
}
- void GenSlidingWindowFunction( std::stringstream& ss ) SAL_OVERRIDE
+ virtual void GenSlidingWindowFunction( std::stringstream& ss ) SAL_OVERRIDE
{
ss << "\ndouble " << mSymName;
ss << "_Random ()\n{\n";
commit 9ed7f53a96a41534338eeef27e6fa3c6c3de9b85
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Oct 3 12:08:49 2014 -0400
Make these non-inline.
Change-Id: I1cc28c16796934f20afc53c6f6f083f372b7ce69
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index 17996e9..e1aef1f 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -13,6 +13,77 @@ using namespace formula;
namespace sc { namespace opencl {
+UnhandledToken::UnhandledToken(
+ formula::FormulaToken* t, const char* m, const std::string& fn, int ln ) :
+ mToken(t), mMessage(m), mFile(fn), mLineNumber(ln) {}
+
+OpenCLError::OpenCLError( cl_int err, const std::string& fn, int ln ) :
+ mError(err), mFile(fn), mLineNumber(ln)
+{
+ SAL_INFO("sc.opencl", "OpenCLError:" << mError << ": " << strerror(mError));
+}
+
+const char* OpenCLError::strerror( cl_int i ) const
+{
+#define CASE(val) case val: return #val
+ switch (i)
+ {
+ CASE(CL_SUCCESS);
+ CASE(CL_DEVICE_NOT_FOUND);
+ CASE(CL_DEVICE_NOT_AVAILABLE);
+ CASE(CL_COMPILER_NOT_AVAILABLE);
+ CASE(CL_MEM_OBJECT_ALLOCATION_FAILURE);
+ CASE(CL_OUT_OF_RESOURCES);
+ CASE(CL_OUT_OF_HOST_MEMORY);
+ CASE(CL_PROFILING_INFO_NOT_AVAILABLE);
+ CASE(CL_MEM_COPY_OVERLAP);
+ CASE(CL_IMAGE_FORMAT_MISMATCH);
+ CASE(CL_IMAGE_FORMAT_NOT_SUPPORTED);
+ CASE(CL_BUILD_PROGRAM_FAILURE);
+ CASE(CL_MAP_FAILURE);
+ CASE(CL_INVALID_VALUE);
+ CASE(CL_INVALID_DEVICE_TYPE);
+ CASE(CL_INVALID_PLATFORM);
+ CASE(CL_INVALID_DEVICE);
+ CASE(CL_INVALID_CONTEXT);
+ CASE(CL_INVALID_QUEUE_PROPERTIES);
+ CASE(CL_INVALID_COMMAND_QUEUE);
+ CASE(CL_INVALID_HOST_PTR);
+ CASE(CL_INVALID_MEM_OBJECT);
+ CASE(CL_INVALID_IMAGE_FORMAT_DESCRIPTOR);
+ CASE(CL_INVALID_IMAGE_SIZE);
+ CASE(CL_INVALID_SAMPLER);
+ CASE(CL_INVALID_BINARY);
+ CASE(CL_INVALID_BUILD_OPTIONS);
+ CASE(CL_INVALID_PROGRAM);
+ CASE(CL_INVALID_PROGRAM_EXECUTABLE);
+ CASE(CL_INVALID_KERNEL_NAME);
+ CASE(CL_INVALID_KERNEL_DEFINITION);
+ CASE(CL_INVALID_KERNEL);
+ CASE(CL_INVALID_ARG_INDEX);
+ CASE(CL_INVALID_ARG_VALUE);
+ CASE(CL_INVALID_ARG_SIZE);
+ CASE(CL_INVALID_KERNEL_ARGS);
+ CASE(CL_INVALID_WORK_DIMENSION);
+ CASE(CL_INVALID_WORK_GROUP_SIZE);
+ CASE(CL_INVALID_WORK_ITEM_SIZE);
+ CASE(CL_INVALID_GLOBAL_OFFSET);
+ CASE(CL_INVALID_EVENT_WAIT_LIST);
+ CASE(CL_INVALID_EVENT);
+ CASE(CL_INVALID_OPERATION);
+ CASE(CL_INVALID_GL_OBJECT);
+ CASE(CL_INVALID_BUFFER_SIZE);
+ CASE(CL_INVALID_MIP_LEVEL);
+ CASE(CL_INVALID_GLOBAL_WORK_SIZE);
+ default:
+ return "Unknown OpenCL error code";
+ }
+#undef CASE
+}
+
+Unhandled::Unhandled( const std::string& fn, int ln ) :
+ mFile(fn), mLineNumber(ln) {}
+
DynamicKernelArgument::DynamicKernelArgument( const std::string& s,
FormulaTreeNodeRef ft ) :
mSymName(s), mFormulaTree(ft) { }
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index 795b7bb..125d24d 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -31,9 +31,7 @@ class FormulaTreeNode;
class UnhandledToken
{
public:
- UnhandledToken( formula::FormulaToken* t,
- const char* m, const std::string& fn = "", int ln = 0 ) :
- mToken(t), mMessage(m), mFile(fn), mLineNumber(ln) {}
+ UnhandledToken( formula::FormulaToken* t, const char* m, const std::string& fn = "", int ln = 0 );
formula::FormulaToken* mToken;
std::string mMessage;
@@ -45,70 +43,11 @@ public:
class OpenCLError
{
private:
- const char* strerror( cl_int i )
- {
-#define CASE(val) case val: return #val
- switch (i)
- {
- CASE(CL_SUCCESS);
- CASE(CL_DEVICE_NOT_FOUND);
- CASE(CL_DEVICE_NOT_AVAILABLE);
- CASE(CL_COMPILER_NOT_AVAILABLE);
- CASE(CL_MEM_OBJECT_ALLOCATION_FAILURE);
- CASE(CL_OUT_OF_RESOURCES);
- CASE(CL_OUT_OF_HOST_MEMORY);
- CASE(CL_PROFILING_INFO_NOT_AVAILABLE);
- CASE(CL_MEM_COPY_OVERLAP);
- CASE(CL_IMAGE_FORMAT_MISMATCH);
- CASE(CL_IMAGE_FORMAT_NOT_SUPPORTED);
- CASE(CL_BUILD_PROGRAM_FAILURE);
- CASE(CL_MAP_FAILURE);
- CASE(CL_INVALID_VALUE);
- CASE(CL_INVALID_DEVICE_TYPE);
- CASE(CL_INVALID_PLATFORM);
- CASE(CL_INVALID_DEVICE);
- CASE(CL_INVALID_CONTEXT);
- CASE(CL_INVALID_QUEUE_PROPERTIES);
- CASE(CL_INVALID_COMMAND_QUEUE);
- CASE(CL_INVALID_HOST_PTR);
- CASE(CL_INVALID_MEM_OBJECT);
- CASE(CL_INVALID_IMAGE_FORMAT_DESCRIPTOR);
- CASE(CL_INVALID_IMAGE_SIZE);
- CASE(CL_INVALID_SAMPLER);
- CASE(CL_INVALID_BINARY);
- CASE(CL_INVALID_BUILD_OPTIONS);
- CASE(CL_INVALID_PROGRAM);
- CASE(CL_INVALID_PROGRAM_EXECUTABLE);
- CASE(CL_INVALID_KERNEL_NAME);
- CASE(CL_INVALID_KERNEL_DEFINITION);
- CASE(CL_INVALID_KERNEL);
- CASE(CL_INVALID_ARG_INDEX);
- CASE(CL_INVALID_ARG_VALUE);
- CASE(CL_INVALID_ARG_SIZE);
- CASE(CL_INVALID_KERNEL_ARGS);
- CASE(CL_INVALID_WORK_DIMENSION);
- CASE(CL_INVALID_WORK_GROUP_SIZE);
- CASE(CL_INVALID_WORK_ITEM_SIZE);
- CASE(CL_INVALID_GLOBAL_OFFSET);
- CASE(CL_INVALID_EVENT_WAIT_LIST);
- CASE(CL_INVALID_EVENT);
- CASE(CL_INVALID_OPERATION);
- CASE(CL_INVALID_GL_OBJECT);
- CASE(CL_INVALID_BUFFER_SIZE);
- CASE(CL_INVALID_MIP_LEVEL);
- CASE(CL_INVALID_GLOBAL_WORK_SIZE);
- default:
- return "Unknown OpenCL error code";
- }
-#undef CASE
- }
+ const char* strerror( cl_int i ) const;
public:
- OpenCLError( cl_int err, const std::string& fn, int ln ) : mError(err),
- mFile(fn), mLineNumber(ln)
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list