Skip to content

Commit

Permalink
Migrate make to ICX/ICPX for Windows (#2712)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandr-Solovev authored Sep 2, 2024
1 parent a8df345 commit 02db743
Show file tree
Hide file tree
Showing 83 changed files with 362 additions and 369 deletions.
2 changes: 1 addition & 1 deletion .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ jobs:
- job: 'LinuxMakeDPCPP'
timeoutInMinutes: 0
variables:
release.dir: '__release_lnx_icx'
release.dir: '__release_lnx'
platform.type : 'lnx32e'
pool:
vmImage: '$(VM_IMAGE)'
Expand Down
4 changes: 4 additions & 0 deletions .ci/scripts/describe_system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ if [ -x "$(command -v icc)" ]; then
echo "ICC:"
icc --version
fi
if [ -x "$(command -v icx)" ]; then
echo "ICX:"
icx --version
fi
if [ -x "$(command -v icpx)" ]; then
echo "ICPX:"
icpx --version
Expand Down
8 changes: 4 additions & 4 deletions cpp/daal/include/algorithms/algorithm_container_base_batch.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ class AlgorithmContainerImpl<batch> : public AlgorithmContainer<batch>
#if defined(TARGET_X86_64)
template <typename sse2Container DAAL_KERNEL_SSE42_ONLY(typename sse42Container) DAAL_KERNEL_AVX2_ONLY(typename avx2Container)
DAAL_KERNEL_AVX512_ONLY(typename avx512Container)>
class DAAL_EXPORT AlgorithmDispatchContainer<batch, sse2Container DAAL_KERNEL_SSE42_ONLY(sse42Container) DAAL_KERNEL_AVX2_ONLY(avx2Container)
DAAL_KERNEL_AVX512_ONLY(avx512Container)> : public AlgorithmContainerImpl<batch>
class AlgorithmDispatchContainer<batch, sse2Container DAAL_KERNEL_SSE42_ONLY(sse42Container) DAAL_KERNEL_AVX2_ONLY(avx2Container)
DAAL_KERNEL_AVX512_ONLY(avx512Container)> : public AlgorithmContainerImpl<batch>
#elif defined(TARGET_ARM)
template <typename SVEContainer DAAL_KERNEL_SVE_ONLY(typename sveContainer)>
class DAAL_EXPORT AlgorithmDispatchContainer<batch, SVEContainer DAAL_KERNEL_SVE_ONLY(sveContainer)> : public AlgorithmContainerImpl<batch>
class AlgorithmDispatchContainer<batch, SVEContainer DAAL_KERNEL_SVE_ONLY(sveContainer)> : public AlgorithmContainerImpl<batch>
#elif defined(TARGET_RISCV64)
template <typename RV64Container DAAL_KERNEL_RV64_ONLY(typename rv64Container)>
class DAAL_EXPORT AlgorithmDispatchContainer<batch, RV64Container DAAL_KERNEL_RV64_ONLY(rv64Container)> : public AlgorithmContainerImpl<batch>
class AlgorithmDispatchContainer<batch, RV64Container DAAL_KERNEL_RV64_ONLY(rv64Container)> : public AlgorithmContainerImpl<batch>
#endif
{
public:
Expand Down
4 changes: 2 additions & 2 deletions cpp/daal/include/algorithms/algorithm_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class PartialResult : public SerializableArgument
/**
* \copydoc daal::data_management::interface1::SerializationIface::getSerializationTag()
*/
virtual int getSerializationTag() const { return 0; }
DAAL_EXPORT virtual int getSerializationTag() const { return 0; }

/**
* Retrieves the initialization flag
Expand Down Expand Up @@ -423,7 +423,7 @@ class Result : public SerializableArgument
/**
* \copydoc daal::data_management::interface1::SerializationIface::getSerializationTag()
*/
virtual int getSerializationTag() const { return 0; }
DAAL_EXPORT virtual int getSerializationTag() const { return 0; }

/**
* Checks the correctness of the final results structure
Expand Down
10 changes: 5 additions & 5 deletions cpp/daal/include/algorithms/covariance/covariance_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class DistributedContainer<step2Master, algorithmFPType, sumCSR, cpu> : public D
* - Result class
*/
template <ComputeStep step>
class DAAL_EXPORT DistributedIface : public daal::algorithms::Analysis<distributed>
class DistributedIface : public daal::algorithms::Analysis<distributed>
{};

/**
Expand Down Expand Up @@ -383,7 +383,7 @@ class DistributedIface<step1Local> : public OnlineImpl
* - Result class
*/
template <>
class DAAL_EXPORT DistributedIface<step2Master> : public daal::algorithms::Analysis<distributed>
class DistributedIface<step2Master> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::covariance::DistributedInput<step2Master> InputType;
Expand Down Expand Up @@ -529,7 +529,7 @@ class DAAL_EXPORT DistributedIface<step2Master> : public daal::algorithms::Analy
* - Result class
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = defaultDense>
class DAAL_EXPORT Distributed : public DistributedIface<step>
class Distributed : public DistributedIface<step>
{};

/**
Expand All @@ -554,7 +554,7 @@ class DAAL_EXPORT Distributed : public DistributedIface<step>
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Online<algorithmFPType, method>
class Distributed<step1Local, algorithmFPType, method> : public Online<algorithmFPType, method>
{
public:
typedef Online<algorithmFPType, method> super;
Expand Down Expand Up @@ -615,7 +615,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Onli
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public DistributedIface<step2Master>
class Distributed<step2Master, algorithmFPType, method> : public DistributedIface<step2Master>
{
public:
typedef DistributedIface<step2Master> super;
Expand Down
26 changes: 13 additions & 13 deletions cpp/daal/include/algorithms/dbscan/dbscan_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ class DAAL_EXPORT Distributed
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -585,7 +585,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step2Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step2Local> InputType;
Expand Down Expand Up @@ -705,7 +705,7 @@ class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step3Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step3Local> InputType;
Expand Down Expand Up @@ -827,7 +827,7 @@ class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step4Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step4Local> InputType;
Expand Down Expand Up @@ -949,7 +949,7 @@ class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step5Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step5Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step5Local> InputType;
Expand Down Expand Up @@ -1070,7 +1070,7 @@ class DAAL_EXPORT Distributed<step5Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step6Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step6Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step6Local> InputType;
Expand Down Expand Up @@ -1192,7 +1192,7 @@ class DAAL_EXPORT Distributed<step6Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step7Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step7Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step7Master> InputType;
Expand Down Expand Up @@ -1298,7 +1298,7 @@ class DAAL_EXPORT Distributed<step7Master, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step8Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step8Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step8Local> InputType;
Expand Down Expand Up @@ -1418,7 +1418,7 @@ class DAAL_EXPORT Distributed<step8Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step9Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step9Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step9Master> InputType;
Expand Down Expand Up @@ -1544,7 +1544,7 @@ class DAAL_EXPORT Distributed<step9Master, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step10Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step10Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step10Local> InputType;
Expand Down Expand Up @@ -1664,7 +1664,7 @@ class DAAL_EXPORT Distributed<step10Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step11Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step11Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step11Local> InputType;
Expand Down Expand Up @@ -1784,7 +1784,7 @@ class DAAL_EXPORT Distributed<step11Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step12Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step12Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step12Local> InputType;
Expand Down Expand Up @@ -1904,7 +1904,7 @@ class DAAL_EXPORT Distributed<step12Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step13Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step13Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step13Local> InputType;
Expand Down
2 changes: 1 addition & 1 deletion cpp/daal/include/algorithms/engines/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace interface1
* <a name="DAAL-CLASS-ALGORITHMS__ENGINES__BATCHBASE"></a>
* \brief Class representing an engine
*/
class DAAL_EXPORT BatchBase : public daal::algorithms::Analysis<batch>
class BatchBase : public daal::algorithms::Analysis<batch>
{
public:
typedef algorithms::engines::Input InputType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class DistributedContainer<step4Local, algorithmFPType, method, cpu> : public Tr
* - \ref Method %Training methods of the implicit ALS algorithm in the first step of the distributed processing mode
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = fastCSR>
class DAAL_EXPORT Distributed : public Training<distributed>
class Distributed : public Training<distributed>
{};

/**
Expand All @@ -200,7 +200,7 @@ class DAAL_EXPORT Distributed : public Training<distributed>
* - \ref DistributedInput<step1Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -307,7 +307,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Trai
* - \ref DistributedInput<step2Master> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public Training<distributed>
class Distributed<step2Master, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step2Master> InputType;
Expand Down Expand Up @@ -414,7 +414,7 @@ class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public Tra
* - \ref DistributedInput<step3Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step3Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step3Local> InputType;
Expand Down Expand Up @@ -521,7 +521,7 @@ class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public Trai
* - \ref DistributedInput<step4Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step4Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step4Local> InputType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class DistributedContainer<step2Local, algorithmFPType, method, cpu> : public Tr
* - \ref Method Initialization methods of the implicit ALS algorithm in the distributed processing mode
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = fastCSR>
class DAAL_EXPORT Distributed
class Distributed
{};

/**
Expand All @@ -138,7 +138,7 @@ class DAAL_EXPORT Distributed
* - \ref Method Initialization methods of the implicit ALS algorithm in the first step of the distributed processing mode
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::init::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -237,7 +237,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Trai
* - \ref Method Initialization methods of the implicit ALS algorithm in the second step of the distributed processing mode
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step2Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::init::DistributedInput<step2Local> InputType;
Expand Down
4 changes: 2 additions & 2 deletions cpp/daal/include/algorithms/kmeans/kmeans_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class DAAL_EXPORT Distributed
* - \ref ResultId Identifiers of results of K-Means algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::Input InputType;
Expand Down Expand Up @@ -294,7 +294,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal
* - Input class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step2Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::DistributedStep2MasterInput InputType;
Expand Down
Loading

0 comments on commit 02db743

Please sign in to comment.