From 0d4deb26cfc91f67947d83371cb2f2ba65f2565f Mon Sep 17 00:00:00 2001 From: Ladislav Zitka Date: Thu, 28 Dec 2023 18:51:11 +0100 Subject: [PATCH] Upgraded various maven plugin versions to latest available. changes #Reverted back 1.8 to 1.7 source and target versions. --- .../java/org/bytedeco/cuda/global/cublas.java | 6 +- .../java/org/bytedeco/cuda/global/cudart.java | 23 +- .../java/org/bytedeco/cuda/global/cudnn.java | 17 +- .../java/org/bytedeco/cuda/global/cufft.java | 6 +- .../java/org/bytedeco/cuda/global/curand.java | 2 +- .../org/bytedeco/cuda/global/cusolver.java | 203 +++++++++--------- .../org/bytedeco/cuda/global/cusparse.java | 6 +- .../java/org/bytedeco/cuda/global/nccl.java | 27 ++- .../java/org/bytedeco/cuda/global/nppc.java | 4 +- .../java/org/bytedeco/cuda/global/nppicc.java | 9 + .../java/org/bytedeco/cuda/global/nppif.java | 4 +- .../java/org/bytedeco/cuda/global/nvcomp.java | 2 +- .../java/org/bytedeco/cuda/global/nvjpeg.java | 10 +- .../java/org/bytedeco/cuda/global/nvml.java | 2 +- pom.xml | 18 +- 15 files changed, 186 insertions(+), 153 deletions(-) diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cublas.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cublas.java index 35576751333..f8d66db17d6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cublas.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cublas.java @@ -103,8 +103,8 @@ public class cublas extends org.bytedeco.cuda.presets.cublas { public static final int CUBLAS_VER_MAJOR = 12; public static final int CUBLAS_VER_MINOR = 3; -public static final int CUBLAS_VER_PATCH = 2; -public static final int CUBLAS_VER_BUILD = 9; +public static final int CUBLAS_VER_PATCH = 4; +public static final int CUBLAS_VER_BUILD = 1; public static final int CUBLAS_VERSION = (CUBLAS_VER_MAJOR * 10000 + CUBLAS_VER_MINOR * 100 + CUBLAS_VER_PATCH); /* CUBLAS status type returns */ @@ -14009,7 +14009,7 @@ public static native void cublasZtrmm(@Cast("char") byte side, // #include "driver_types.h" // #include "cuComplex.h" /* import complex data type */ -// #include "cublas_api.h" +// #include "cublas_v2.h" // #if defined(__cplusplus) // Targeting ../cublas/cublasXtContext.java diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cudart.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cudart.java index 19ae4245923..286aceab783 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cudart.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cudart.java @@ -1496,8 +1496,9 @@ public class cudart extends org.bytedeco.cuda.presets.cudart { /** * This option hints to the JIT compiler the minimum number of CTAs from the * kernel’s grid to be mapped to a SM. Optimizations based on this option - * need either ::CU_JIT_MAX_REGISTERS or ::CU_JIT_THREADS_PER_BLOCK to be - * specified as well. + * need the maximum number of threads per block to be specified as well. This + * option is ignored when used together with ::CU_JIT_MAX_REGISTERS or + * ::CU_JIT_THREADS_PER_BLOCK. * Option type: unsigned int\n * Applies to: compiler only */ @@ -1995,7 +1996,7 @@ interop event. The event must disable timing (i.e. B has a launch completion dependency on a kernel A, B may wait until A is complete. Alternatively, blocks of B may begin before all blocks of A have begun, for example if B can claim execution - resources unavaiable to A (e.g. they run on different GPUs) or + resources unavailable to A (e.g. they run on different GPUs) or if B is a higher priority than A. Exercise caution if such an ordering inversion could lead to deadlock. @@ -25512,11 +25513,8 @@ inside of a graph. The graph(s) contained within the body of the conditional nod Only one instantiation of the graph may exist at any point in time. The graph cannot be cloned. - To set the control value: - - In a kernel or kernels at appropriate locations in the graph, insert a call to - {@code void cudaGraphSetConditional(cudaGraphConditionalHandle handle, unsigned int value)}. - Supply a default value when creating the handle. */ + To set the control value, supply a default value when creating the handle and/or + call ::cudaGraphSetConditional from device code.*/ cudaGraphNodeTypeConditional = 0x0d, cudaGraphNodeTypeCount = 0x0d + 1; // Targeting ../cudart/cudaChildGraphNodeParams.java @@ -25790,12 +25788,9 @@ interop event. The event must disable timing (i.e. have begun execution. Currently this is a best effort. If a kernel B has a launch completion dependency on a kernel A, B may wait until A is complete. Alternatively, blocks of B may begin before - all blocks of A have begun, for example: - + all blocks of A have begun, for example if B can claim execution + resources unavailable to A (e.g. they run on different GPUs) or + if B is a higher priority than A. Exercise caution if such an ordering inversion could lead to deadlock.
diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java index a6c49af113c..a87e1f694d6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cudnn.java @@ -157,7 +157,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { public static final int CUDNN_MAJOR = 8; public static final int CUDNN_MINOR = 9; -public static final int CUDNN_PATCHLEVEL = 5; +public static final int CUDNN_PATCHLEVEL = 7; public static final int CUDNN_VERSION = (CUDNN_MAJOR * 1000 + CUDNN_MINOR * 100 + CUDNN_PATCHLEVEL); @@ -276,7 +276,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_OPS_INFER_MAJOR = 8; public static final int CUDNN_OPS_INFER_MINOR = 9; -public static final int CUDNN_OPS_INFER_PATCH = 5; +public static final int CUDNN_OPS_INFER_PATCH = 7; // #if (CUDNN_OPS_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_OPS_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_OPS_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -1620,7 +1620,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_OPS_TRAIN_MAJOR = 8; public static final int CUDNN_OPS_TRAIN_MINOR = 9; -public static final int CUDNN_OPS_TRAIN_PATCH = 5; +public static final int CUDNN_OPS_TRAIN_PATCH = 7; // #if (CUDNN_OPS_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_OPS_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_OPS_TRAIN_PATCH != CUDNN_PATCHLEVEL) @@ -2051,7 +2051,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_ADV_INFER_MAJOR = 8; public static final int CUDNN_ADV_INFER_MINOR = 9; -public static final int CUDNN_ADV_INFER_PATCH = 5; +public static final int CUDNN_ADV_INFER_PATCH = 7; // #if (CUDNN_ADV_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_ADV_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_ADV_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -3120,7 +3120,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_ADV_TRAIN_MAJOR = 8; public static final int CUDNN_ADV_TRAIN_MINOR = 9; -public static final int CUDNN_ADV_TRAIN_PATCH = 5; +public static final int CUDNN_ADV_TRAIN_PATCH = 7; // #if (CUDNN_ADV_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_ADV_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_ADV_TRAIN_PATCH != CUDNN_PATCHLEVEL) @@ -4284,7 +4284,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_CNN_INFER_MAJOR = 8; public static final int CUDNN_CNN_INFER_MINOR = 9; -public static final int CUDNN_CNN_INFER_PATCH = 5; +public static final int CUDNN_CNN_INFER_PATCH = 7; // #if (CUDNN_CNN_INFER_MAJOR != CUDNN_MAJOR) || (CUDNN_CNN_INFER_MINOR != CUDNN_MINOR) || // (CUDNN_CNN_INFER_PATCH != CUDNN_PATCHLEVEL) @@ -5007,7 +5007,7 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { /* These version numbers are autogenerated, do not edit manually. */ public static final int CUDNN_CNN_TRAIN_MAJOR = 8; public static final int CUDNN_CNN_TRAIN_MINOR = 9; -public static final int CUDNN_CNN_TRAIN_PATCH = 5; +public static final int CUDNN_CNN_TRAIN_PATCH = 7; // #if (CUDNN_CNN_TRAIN_MAJOR != CUDNN_MAJOR) || (CUDNN_CNN_TRAIN_MINOR != CUDNN_MINOR) || // (CUDNN_CNN_TRAIN_PATCH != CUDNN_PATCHLEVEL) @@ -5769,7 +5769,8 @@ public class cudnn extends org.bytedeco.cuda.presets.cudnn { CUDNN_LAYER_NORM = 0, CUDNN_INSTANCE_NORM = 1, CUDNN_BATCH_NORM = 2, - CUDNN_GROUP_NORM = 3; + CUDNN_GROUP_NORM = 3, + CUDNN_RMS_NORM = 4; /** enum cudnnBackendNormFwdPhase_t */ public static final int diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cufft.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cufft.java index 69af98692f9..420462d99d5 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cufft.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cufft.java @@ -91,10 +91,10 @@ public class cufft extends org.bytedeco.cuda.presets.cufft { public static final int CUFFT_VER_MAJOR = 11; public static final int CUFFT_VER_MINOR = 0; -public static final int CUFFT_VER_PATCH = 11; -public static final int CUFFT_VER_BUILD = 19; +public static final int CUFFT_VER_PATCH = 12; +public static final int CUFFT_VER_BUILD = 1; -public static final int CUFFT_VERSION = 11011; +public static final int CUFFT_VERSION = 11012; // CUFFT API function return values /** enum cufftResult */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/curand.java b/cuda/src/gen/java/org/bytedeco/cuda/global/curand.java index f516072b9cf..3945bb94cb6 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/curand.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/curand.java @@ -92,7 +92,7 @@ public class curand extends org.bytedeco.cuda.presets.curand { public static final int CURAND_VER_MAJOR = 10; public static final int CURAND_VER_MINOR = 3; public static final int CURAND_VER_PATCH = 4; -public static final int CURAND_VER_BUILD = 52; +public static final int CURAND_VER_BUILD = 101; public static final int CURAND_VERSION = (CURAND_VER_MAJOR * 1000 + CURAND_VER_MINOR * 100 + CURAND_VER_PATCH); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cusolver.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cusolver.java index b87d6f1e9f0..6d3a4c31dea 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cusolver.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cusolver.java @@ -71,108 +71,108 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { */ // #if !defined(CUSOLVER_COMMON_H_) -// #define CUSOLVER_COMMON_H_ +// #define CUSOLVER_COMMON_H_ + +// #include "library_types.h" + +// #ifndef CUSOLVERAPI +// #ifdef _WIN32 +// #define CUSOLVERAPI __stdcall +// #else +// #define CUSOLVERAPI +// #endif +// #endif + +// #if defined(_MSC_VER) +// #else +// #include +// #endif + +public static final int CUSOLVER_VER_MAJOR = 11; +public static final int CUSOLVER_VER_MINOR = 5; +public static final int CUSOLVER_VER_PATCH = 4; +public static final int CUSOLVER_VER_BUILD = 101; +public static final int CUSOLVER_VERSION = + (CUSOLVER_VER_MAJOR * 1000 + CUSOLVER_VER_MINOR * 100 + CUSOLVER_VER_PATCH); -// #include "library_types.h" - -// #ifndef CUSOLVERAPI -// #ifdef _WIN32 -// #define CUSOLVERAPI __stdcall -// #else -// #define CUSOLVERAPI -// #endif -// #endif - -// #if defined(_MSC_VER) -// #else -// #include -// #endif - - public static final int CUSOLVER_VER_MAJOR = 11; - public static final int CUSOLVER_VER_MINOR = 5; - public static final int CUSOLVER_VER_PATCH = 3; - public static final int CUSOLVER_VER_BUILD = 52; - public static final int CUSOLVER_VERSION = - (CUSOLVER_VER_MAJOR * 1000 + CUSOLVER_VER_MINOR * 100 + CUSOLVER_VER_PATCH); - - /* - * disable this macro to proceed old API - */ -// #define DISABLE_CUSOLVER_DEPRECATED +/* + * disable this macro to proceed old API + */ +// #define DISABLE_CUSOLVER_DEPRECATED //------------------------------------------------------------------------------ -// #if !defined(_MSC_VER) -// #define CUSOLVER_CPP_VERSION __cplusplus -// #elif _MSC_FULL_VER >= 190024210 // Visual Studio 2015 Update 3 -// #define CUSOLVER_CPP_VERSION _MSVC_LANG -// #else -// #define CUSOLVER_CPP_VERSION 0 -// #endif +// #if !defined(_MSC_VER) +// #define CUSOLVER_CPP_VERSION __cplusplus +// #elif _MSC_FULL_VER >= 190024210 // Visual Studio 2015 Update 3 +// #define CUSOLVER_CPP_VERSION _MSVC_LANG +// #else +// #define CUSOLVER_CPP_VERSION 0 +// #endif //------------------------------------------------------------------------------ -// #if !defined(DISABLE_CUSOLVER_DEPRECATED) +// #if !defined(DISABLE_CUSOLVER_DEPRECATED) -// #if CUSOLVER_CPP_VERSION >= 201402L +// #if CUSOLVER_CPP_VERSION >= 201402L -// #define CUSOLVER_DEPRECATED(new_func) -// [[deprecated("please use " #new_func " instead")]] +// #define CUSOLVER_DEPRECATED(new_func) +// [[deprecated("please use " #new_func " instead")]] -// #elif defined(_MSC_VER) +// #elif defined(_MSC_VER) -// #define CUSOLVER_DEPRECATED(new_func) -// __declspec(deprecated("please use " #new_func " instead")) +// #define CUSOLVER_DEPRECATED(new_func) +// __declspec(deprecated("please use " #new_func " instead")) -// #elif defined(__INTEL_COMPILER) || defined(__clang__) || -// (defined(__GNUC__) && -// (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))) +// #elif defined(__INTEL_COMPILER) || defined(__clang__) || +// (defined(__GNUC__) && +// (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))) -// #define CUSOLVER_DEPRECATED(new_func) -// __attribute__((deprecated("please use " #new_func " instead"))) +// #define CUSOLVER_DEPRECATED(new_func) +// __attribute__((deprecated("please use " #new_func " instead"))) -// #elif defined(__GNUC__) || defined(__xlc__) +// #elif defined(__GNUC__) || defined(__xlc__) -// #define CUSOLVER_DEPRECATED(new_func) __attribute__((deprecated)) +// #define CUSOLVER_DEPRECATED(new_func) __attribute__((deprecated)) -// #else +// #else -// #define CUSOLVER_DEPRECATED(new_func) +// #define CUSOLVER_DEPRECATED(new_func) -// #endif // defined(__cplusplus) && __cplusplus >= 201402L - //------------------------------------------------------------------------------ +// #endif // defined(__cplusplus) && __cplusplus >= 201402L +//------------------------------------------------------------------------------ -// #if CUSOLVER_CPP_VERSION >= 201703L +// #if CUSOLVER_CPP_VERSION >= 201703L -// #define CUSOLVER_DEPRECATED_ENUM(new_enum) -// [[deprecated("please use " #new_enum " instead")]] +// #define CUSOLVER_DEPRECATED_ENUM(new_enum) +// [[deprecated("please use " #new_enum " instead")]] -// #elif defined(__clang__) || -// (defined(__GNUC__) && __GNUC__ >= 6 && !defined(__PGI)) +// #elif defined(__clang__) || +// (defined(__GNUC__) && __GNUC__ >= 6 && !defined(__PGI)) -// #define CUSOLVER_DEPRECATED_ENUM(new_enum) -// __attribute__((deprecated("please use " #new_enum " instead"))) +// #define CUSOLVER_DEPRECATED_ENUM(new_enum) +// __attribute__((deprecated("please use " #new_enum " instead"))) -// #else +// #else -// #define CUSOLVER_DEPRECATED_ENUM(new_enum) +// #define CUSOLVER_DEPRECATED_ENUM(new_enum) -// #endif // defined(__cplusplus) && __cplusplus >= 201402L +// #endif // defined(__cplusplus) && __cplusplus >= 201402L -// #else // defined(DISABLE_CUSOLVER_DEPRECATED) +// #else // defined(DISABLE_CUSOLVER_DEPRECATED) -// #define CUSOLVER_DEPRECATED(new_func) -// #define CUSOLVER_DEPRECATED_ENUM(new_enum) +// #define CUSOLVER_DEPRECATED(new_func) +// #define CUSOLVER_DEPRECATED_ENUM(new_enum) -// #endif // !defined(DISABLE_CUSOLVER_DEPRECATED) +// #endif // !defined(DISABLE_CUSOLVER_DEPRECATED) -// #undef CUSOLVER_CPP_VERSION +// #undef CUSOLVER_CPP_VERSION -// #if defined(__cplusplus) -// #endif /* __cplusplus */ +// #if defined(__cplusplus) +// #endif /* __cplusplus */ - /** enum cusolverStatus_t */ - public static final int +/** enum cusolverStatus_t */ +public static final int CUSOLVER_STATUS_SUCCESS = 0, CUSOLVER_STATUS_NOT_INITIALIZED = 1, CUSOLVER_STATUS_ALLOC_FAILED = 2, @@ -199,32 +199,32 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { CUSOLVER_STATUS_IRS_MATRIX_SINGULAR = 30, CUSOLVER_STATUS_INVALID_WORKSPACE = 31; - /** enum cusolverEigType_t */ - public static final int +/** enum cusolverEigType_t */ +public static final int CUSOLVER_EIG_TYPE_1 = 1, CUSOLVER_EIG_TYPE_2 = 2, CUSOLVER_EIG_TYPE_3 = 3; - /** enum cusolverEigMode_t */ - public static final int +/** enum cusolverEigMode_t */ +public static final int CUSOLVER_EIG_MODE_NOVECTOR = 0, CUSOLVER_EIG_MODE_VECTOR = 1; - /** enum cusolverEigRange_t */ - public static final int +/** enum cusolverEigRange_t */ +public static final int CUSOLVER_EIG_RANGE_ALL = 1001, CUSOLVER_EIG_RANGE_I = 1002, CUSOLVER_EIG_RANGE_V = 1003; - /** enum cusolverNorm_t */ - public static final int +/** enum cusolverNorm_t */ +public static final int CUSOLVER_INF_NORM = 104, CUSOLVER_MAX_NORM = 105, CUSOLVER_ONE_NORM = 106, CUSOLVER_FRO_NORM = 107; - /** enum cusolverIRSRefinement_t */ - public static final int +/** enum cusolverIRSRefinement_t */ +public static final int CUSOLVER_IRS_REFINE_NOT_SET = 1100, CUSOLVER_IRS_REFINE_NONE = 1101, CUSOLVER_IRS_REFINE_CLASSICAL = 1102, @@ -237,8 +237,8 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { CUSOLVER_PREC_SS = 1151, CUSOLVER_PREC_SHT = 1152; - /** enum cusolverPrecType_t */ - public static final int +/** enum cusolverPrecType_t */ +public static final int CUSOLVER_R_8I = 1201, CUSOLVER_R_8U = 1202, CUSOLVER_R_64F = 1203, @@ -256,34 +256,37 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { CUSOLVER_C_TF32 = 1217, CUSOLVER_C_AP = 1218; - /** enum cusolverAlgMode_t */ - public static final int +/** enum cusolverAlgMode_t */ +public static final int CUSOLVER_ALG_0 = 0, /* default algorithm */ CUSOLVER_ALG_1 = 1, CUSOLVER_ALG_2 = 2; - /** enum cusolverStorevMode_t */ - public static final int +/** enum cusolverStorevMode_t */ +public static final int CUBLAS_STOREV_COLUMNWISE = 0, CUBLAS_STOREV_ROWWISE = 1; - /** enum cusolverDirectMode_t */ - public static final int +/** enum cusolverDirectMode_t */ +public static final int CUBLAS_DIRECT_FORWARD = 0, CUBLAS_DIRECT_BACKWARD = 1; - public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, IntPointer value); - public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, IntBuffer value); - public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, int[] value); +public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, + IntPointer value); +public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, + IntBuffer value); +public static native @Cast("cusolverStatus_t") int cusolverGetProperty(@Cast("libraryPropertyType") int type, + int[] value); - public static native @Cast("cusolverStatus_t") int cusolverGetVersion(IntPointer version); - public static native @Cast("cusolverStatus_t") int cusolverGetVersion(IntBuffer version); - public static native @Cast("cusolverStatus_t") int cusolverGetVersion(int[] version); +public static native @Cast("cusolverStatus_t") int cusolverGetVersion(IntPointer version); +public static native @Cast("cusolverStatus_t") int cusolverGetVersion(IntBuffer version); +public static native @Cast("cusolverStatus_t") int cusolverGetVersion(int[] version); -// #if defined(__cplusplus) -// #endif /* __cplusplus */ +// #if defined(__cplusplus) +// #endif /* __cplusplus */ -// #endif // CUSOLVER_COMMON_H_ +// #endif // CUSOLVER_COMMON_H_ // Parsed from @@ -375,7 +378,7 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { // #include // #include "cuComplex.h" /* import complex data type */ -// #include "cublas_api.h" +// #include "cublas_v2.h" // #include "cusolver_common.h" /*******************************************************************************/ @@ -14192,7 +14195,7 @@ public class cusolver extends org.bytedeco.cuda.presets.cusolver { // #define CUSOLVERSP_H_ // #include "cusparse.h" -// #include "cublas_api.h" +// #include "cublas_v2.h" // #include "cusolver_common.h" // #if defined(__cplusplus) diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/cusparse.java b/cuda/src/gen/java/org/bytedeco/cuda/global/cusparse.java index bd267ab2a65..ad538fa5714 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/cusparse.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/cusparse.java @@ -83,9 +83,9 @@ public class cusparse extends org.bytedeco.cuda.presets.cusparse { //############################################################################## public static final int CUSPARSE_VER_MAJOR = 12; -public static final int CUSPARSE_VER_MINOR = 1; -public static final int CUSPARSE_VER_PATCH = 3; -public static final int CUSPARSE_VER_BUILD = 153; +public static final int CUSPARSE_VER_MINOR = 2; +public static final int CUSPARSE_VER_PATCH = 0; +public static final int CUSPARSE_VER_BUILD = 103; public static final int CUSPARSE_VERSION = (CUSPARSE_VER_MAJOR * 1000 + CUSPARSE_VER_MINOR * 100 + CUSPARSE_VER_PATCH); diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nccl.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nccl.java index 9b8da35e86c..0e16895c2e9 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nccl.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nccl.java @@ -33,11 +33,11 @@ public class nccl extends org.bytedeco.cuda.presets.nccl { // #endif public static final int NCCL_MAJOR = 2; -public static final int NCCL_MINOR = 18; -public static final int NCCL_PATCH = 5; +public static final int NCCL_MINOR = 19; +public static final int NCCL_PATCH = 3; public static final String NCCL_SUFFIX = ""; -public static final int NCCL_VERSION_CODE = 21805; +public static final int NCCL_VERSION_CODE = 21903; // #define NCCL_VERSION(X,Y,Z) (((X) <= 2 && (Y) <= 8) ? (X) * 1000 + (Y) * 100 + (Z) : (X) * 10000 + (Y) * 100 + (Z)) // #ifdef __cplusplus @@ -87,6 +87,17 @@ public class nccl extends org.bytedeco.cuda.presets.nccl { // NCCL_CONFIG_UNDEF_INT /* splitShare */ // } +/* NCCL malloc and free function for all types of NCCL optimizations + * (e.g. user buffer registration). The actual allocated size might + * be larger than requested due to granularity requirement. */ +public static native @Cast("ncclResult_t") int ncclMemAlloc(@Cast("void**") PointerPointer ptr, @Cast("size_t") long size); +public static native @Cast("ncclResult_t") int ncclMemAlloc(@Cast("void**") @ByPtrPtr Pointer ptr, @Cast("size_t") long size); +public static native @Cast("ncclResult_t") int pncclMemAlloc(@Cast("void**") PointerPointer ptr, @Cast("size_t") long size); +public static native @Cast("ncclResult_t") int pncclMemAlloc(@Cast("void**") @ByPtrPtr Pointer ptr, @Cast("size_t") long size); + +public static native @Cast("ncclResult_t") int ncclMemFree(Pointer ptr); +public static native @Cast("ncclResult_t") int pncclMemFree(Pointer ptr); + /* Return the NCCL_VERSION_CODE of the NCCL library in the supplied integer. * This integer is coded with the MAJOR, MINOR and PATCH level of the * NCCL library @@ -468,6 +479,16 @@ public class nccl extends org.bytedeco.cuda.presets.nccl { public static native @Cast("ncclResult_t") int ncclGroupEnd(); public static native @Cast("ncclResult_t") int pncclGroupEnd(); +/* Register CUDA buffer for zero-copy operation */ +public static native @Cast("ncclResult_t") int ncclCommRegister(ncclComm comm, Pointer buff, @Cast("size_t") long size, @Cast("void**") PointerPointer handle); +public static native @Cast("ncclResult_t") int ncclCommRegister(ncclComm comm, Pointer buff, @Cast("size_t") long size, @Cast("void**") @ByPtrPtr Pointer handle); +public static native @Cast("ncclResult_t") int pncclCommRegister(ncclComm comm, Pointer buff, @Cast("size_t") long size, @Cast("void**") PointerPointer handle); +public static native @Cast("ncclResult_t") int pncclCommRegister(ncclComm comm, Pointer buff, @Cast("size_t") long size, @Cast("void**") @ByPtrPtr Pointer handle); + +/* Deregister CUDA buffer */ +public static native @Cast("ncclResult_t") int ncclCommDeregister(ncclComm comm, Pointer handle); +public static native @Cast("ncclResult_t") int pncclCommDeregister(ncclComm comm, Pointer handle); + // #ifdef __cplusplus // end extern "C" // #endif diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nppc.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nppc.java index 6a6296ae76d..2c07a409fcc 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nppc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nppc.java @@ -84,11 +84,11 @@ public class nppc extends org.bytedeco.cuda.presets.nppc { /** * Patch version */ -public static final int NPP_VER_PATCH = 2; +public static final int NPP_VER_PATCH = 3; /** * Build version */ -public static final int NPP_VER_BUILD = 32; +public static final int NPP_VER_BUILD = 2; /** * Full version diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nppicc.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nppicc.java index a790b5e09de..df44ed854fb 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nppicc.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nppicc.java @@ -11108,6 +11108,8 @@ public class nppicc extends org.bytedeco.cuda.presets.nppicc { * Forward gamma correction. * \{ */ + +// #ifndef NPP_PLUS /** * 3 channel 8-bit unsigned packed color not in place forward gamma correction. * @@ -11274,12 +11276,17 @@ public class nppicc extends org.bytedeco.cuda.presets.nppicc { public static native @Cast("NppStatus") int nppiGammaFwd_8u_IP3R(@Cast("Npp8u*const*") @ByPtrPtr ByteBuffer pSrcDst, int nSrcDstStep, @ByVal NppiSize oSizeROI); public static native @Cast("NppStatus") int nppiGammaFwd_8u_IP3R(@Cast("Npp8u*const*") @ByPtrPtr byte[] pSrcDst, int nSrcDstStep, @ByVal NppiSize oSizeROI); +// #endif + /** \} */ /** \name GammaInv * Inverse gamma correction. * \{ */ + +// #ifndef NPP_PLUS + /** * 3 channel 8-bit unsigned packed color not in place inverse gamma correction. * @@ -11446,6 +11453,8 @@ public class nppicc extends org.bytedeco.cuda.presets.nppicc { public static native @Cast("NppStatus") int nppiGammaInv_8u_IP3R(@Cast("Npp8u*const*") @ByPtrPtr ByteBuffer pSrcDst, int nSrcDstStep, @ByVal NppiSize oSizeROI); public static native @Cast("NppStatus") int nppiGammaInv_8u_IP3R(@Cast("Npp8u*const*") @ByPtrPtr byte[] pSrcDst, int nSrcDstStep, @ByVal NppiSize oSizeROI); +// #endif + /** \} */ /** \} image_color_gamma_correction */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nppif.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nppif.java index 10587a9328a..af238dd8db9 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nppif.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nppif.java @@ -17669,7 +17669,7 @@ public class nppif extends org.bytedeco.cuda.presets.nppif { * * @param pSrc \ref source_image_pointer. * @param nSrcStep \ref source_image_line_step. - * @param oSrcSize Source image width and height in pixels relative to pSrc. + * @param oSrcSize Full source image width and height in pixels. * @param oSrcOffset The pixel offset that pSrc points to relative to the origin of the source image. * @param pDst \ref destination_image_pointer. * @param nDstStep \ref destination_image_line_step. @@ -18101,7 +18101,7 @@ public class nppif extends org.bytedeco.cuda.presets.nppif { * * @param pSrc \ref source_image_pointer. * @param nSrcStep \ref source_image_line_step. - * @param oSrcSize Source image width and height in pixels relative to pSrc. + * @param oSrcSize Full source image width and height in pixels. * @param oSrcOffset The pixel offset that pSrc points to relative to the origin of the source image. * @param pDst \ref destination_image_pointer. * @param nDstStep \ref destination_image_line_step. diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nvcomp.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nvcomp.java index 311e126cdca..c973ea2b717 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nvcomp.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nvcomp.java @@ -62,7 +62,7 @@ public class nvcomp extends org.bytedeco.cuda.presets.nvcomp { public static final int NVCOMP_MAJOR_VERSION = 3; public static final int NVCOMP_MINOR_VERSION = 0; -public static final int NVCOMP_PATCH_VERSION = 3; +public static final int NVCOMP_PATCH_VERSION = 5; /* Supported datatypes */ /** enum nvcompType_t */ diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nvjpeg.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nvjpeg.java index 3ede78bbf65..7da6c65d317 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nvjpeg.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nvjpeg.java @@ -86,9 +86,9 @@ public class nvjpeg extends org.bytedeco.cuda.presets.nvjpeg { // nvjpeg version information public static final int NVJPEG_VER_MAJOR = 12; -public static final int NVJPEG_VER_MINOR = 2; -public static final int NVJPEG_VER_PATCH = 3; -public static final int NVJPEG_VER_BUILD = 32; +public static final int NVJPEG_VER_MINOR = 3; +public static final int NVJPEG_VER_PATCH = 0; +public static final int NVJPEG_VER_BUILD = 81; /* nvJPEG status enums, returned by nvJPEG API */ /** enum nvjpegStatus_t */ @@ -635,6 +635,8 @@ public class nvjpeg extends org.bytedeco.cuda.presets.nvjpeg { nvjpegPinnedAllocatorV2_t pinned_allocator, @ByPtrPtr nvjpegBufferPinned buffer); +public static native @Cast("nvjpegStatus_t") int nvjpegBufferPinnedResize(nvjpegBufferPinned buffer, @Cast("size_t") long size, CUstream_st stream); + public static native @Cast("nvjpegStatus_t") int nvjpegBufferPinnedDestroy(nvjpegBufferPinned buffer); // Targeting ../nvjpeg/nvjpegBufferDevice.java @@ -648,6 +650,8 @@ public class nvjpeg extends org.bytedeco.cuda.presets.nvjpeg { nvjpegDevAllocatorV2_t device_allocator, @ByPtrPtr nvjpegBufferDevice buffer); +public static native @Cast("nvjpegStatus_t") int nvjpegBufferDeviceResize(nvjpegBufferDevice buffer, @Cast("size_t") long size, CUstream_st stream); + public static native @Cast("nvjpegStatus_t") int nvjpegBufferDeviceDestroy(nvjpegBufferDevice buffer); // retrieve buffer size and pointer - this allows reusing buffer when decode is not needed diff --git a/cuda/src/gen/java/org/bytedeco/cuda/global/nvml.java b/cuda/src/gen/java/org/bytedeco/cuda/global/nvml.java index 2c50e19718d..901059bcb06 100644 --- a/cuda/src/gen/java/org/bytedeco/cuda/global/nvml.java +++ b/cuda/src/gen/java/org/bytedeco/cuda/global/nvml.java @@ -1122,7 +1122,7 @@ The NVIDIA Management Library (NVML) is a C-based programmatic interface for mon public static final int NVML_SCHEDULER_SW_MAX_LOG_ENTRIES = 200; -public static final int NVML_VGPU_SCHEDULER_ARR_UNDEFINED = 0; +public static final int NVML_VGPU_SCHEDULER_ARR_DEFAULT = 0; public static final int NVML_VGPU_SCHEDULER_ARR_DISABLE = 1; public static final int NVML_VGPU_SCHEDULER_ARR_ENABLE = 2; // Targeting ../nvml/nvmlVgpuSchedulerParams_t.java diff --git a/pom.xml b/pom.xml index e2c38ce97d8..f2327bfd621 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ maven-resources-plugin - 3.1.0 + 3.3.1 javacpp-parser @@ -142,7 +142,7 @@ maven-compiler-plugin - 3.8.1 + 3.12.1 1.7 1.7 @@ -305,7 +305,7 @@ maven-jar-plugin - 3.2.0 + 3.3.0 default-jar @@ -372,7 +372,7 @@ org.moditect moditect-maven-plugin - 1.0.0.RC2 + 1.1.0 9 true @@ -406,14 +406,14 @@ maven-install-plugin - 3.0.0-M1 + 3.1.1 true maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -429,7 +429,7 @@ maven-javadoc-plugin - 3.3.1 + 3.6.3 attach-javadocs @@ -453,7 +453,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.5.0 add-source @@ -473,7 +473,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true sonatype-nexus-staging