dpuserv workable

heterodb · Aug 26, 2024 · 61e9488 · 61e9488
1 parent 4196187
commit 61e9488
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/heterodb_extra.h b/src/heterodb_extra.h
@@ -12,7 +12,6 @@
  */
 #ifndef HETERODB_EXTRA_H
 #define HETERODB_EXTRA_H
-#include <cuda.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -75,6 +74,10 @@ extern int			heterodbValidateDevice(const char *gpu_device_name,
 extern const char  *heterodbInitOptimalGpus(const char *manual_config);
 extern int64_t		heterodbGetOptimalGpus(const char *path,
 										   const char *policy);
+/*
+ * GPU related stuff must include <cuda.h> first, but DPU stuff skips them
+ */
+#ifdef __cuda_cuda_h__
 extern bool			gpuDirectInitDriver(void);
 extern bool			gpuDirectOpenDriver(void);
 extern bool			gpuDirectCloseDriver(void);
@@ -101,6 +104,7 @@ extern bool			gpuDirectFileReadAsyncIOV(const char *pathname,
 											  uint32_t *p_error_code_async,
 											  uint32_t *p_npages_direct_read,
 											  uint32_t *p_npages_vfs_read);
+#endif	/* __cuda_cuda_h__ */
 extern const char  *gpuDirectGetProperty(void);
 extern bool			gpuDirectSetProperty(const char *key,
 										 const char *value);

diff --git a/src/xpu_common.h b/src/xpu_common.h
@@ -483,6 +483,7 @@ typedef struct
 			assert(vs_ops->xpu_type_alignof <= 16);						\
 			KCXT->kvars_slot[__i] = (struct xpu_datum_t *)				\
 				alloca(vs_ops->xpu_type_sizeof);						\
+			KCXT->kvars_slot[__i]->expr_ops = NULL;						\
 		}													   			\
 		KCXT->kvars_desc = __vs_desc;									\
 		KCXT->vlpos = KCXT->vlbuf;										\

diff --git a/src/xpu_timelib.cu b/src/xpu_timelib.cu
@@ -2780,9 +2780,12 @@ pgfn_interval_um(XPU_PGFUNCTION_ARGS)
 		result->value.month = -ival.value.month;
 		result->value.day   = -ival.value.day;
 		result->value.time  = -ival.value.time;
-		if (result->value.time != 0 && SAMESIGN(ival.value.time, result->value.time) ||
-			result->value.day != 0 && SAMESIGN(ival.value.day, result->value.day) ||
-			result->value.month != 0 && SAMESIGN(ival.value.month, result->value.month))
+		if ((result->value.time  != 0 && SAMESIGN(ival.value.time,
+												  result->value.time)) ||
+			(result->value.day   != 0 && SAMESIGN(ival.value.day,
+												  result->value.day)) ||
+			(result->value.month != 0 && SAMESIGN(ival.value.month,
+												  result->value.month)))
 		{
 			STROM_ELOG(kcxt, "interval out of range");
 			return false;