Drop support for Chapel 1.30 (Bears-R-Us#2844)

* removed 1.30 compatibilyt modules * Removed include statements for the empty compatibility modules. --- Signed-off-by: Brandon Neth <brandon.neth@hpe.com> * Removed the empty compatibility module files --- Signed-off-by: Brandon Neth <brandon.neth@hpe.com> * makefile changes for the compatibility module paths * updated CI workflows to use 1.32 and 1.31 for the chapel portability workflow * missed one of the compatibility module paths in the make doc commands --------- Co-authored-by: pierce <48131946+pierce314159@users.noreply.github.com>
hokiegeek2 · Nov 7, 2023 · 1af3785 · 1af3785
1 parent 58bf71f
commit 1af3785
Show file tree

Hide file tree

Showing 49 changed files with 11 additions and 2,820 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -17,7 +17,7 @@ jobs:
   mypy:
     runs-on: ubuntu-latest
     container:
-      image: chapel/chapel:1.31.0
+      image: chapel/chapel:1.32.0
     steps:
     - uses: actions/checkout@v3
     - name: Install dependencies
@@ -32,7 +32,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     container:
-      image: chapel/chapel:1.31.0
+      image: chapel/chapel:1.32.0
     steps:
     - uses: actions/checkout@v3
     - name: Install dependencies
@@ -47,7 +47,7 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
     container:
-      image: chapel/chapel:1.31.0
+      image: chapel/chapel:1.32.0
     steps:
       - uses: actions/checkout@v3
       - name: Install Dependencies
@@ -65,7 +65,7 @@ jobs:
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.x']
     container:
-      image: chapel/chapel:1.31.0
+      image: chapel/chapel:1.32.0
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        chpl-version: ['1.30.0']
+        chpl-version: ['1.31.0']
     container:
       image: chapel/chapel:${{matrix.chpl-version}}
     steps:
@@ -131,7 +131,7 @@ jobs:
     env:
       CHPL_RT_NUM_THREADS_PER_LOCALE: ${{matrix.threads}}
     container:
-      image: chapel/${{matrix.image}}:1.31.0
+      image: chapel/${{matrix.image}}:1.32.0
     steps:
     - uses: actions/checkout@v3
     - name: Install dependencies

diff --git a/Makefile b/Makefile
@@ -206,15 +206,15 @@ $(ARROW_O): $(ARROW_CPP) $(ARROW_H)
 	make compile-arrow-cpp
 
 CHPL_MINOR := $(shell $(CHPL) --version | sed -n "s/chpl version 1\.\([0-9]*\).*/\1/p")
-CHPL_VERSION_OK := $(shell test $(CHPL_MINOR) -ge 30 && echo yes)
-CHPL_VERSION_WARN := $(shell test $(CHPL_MINOR) -le 30 && echo yes)
+CHPL_VERSION_OK := $(shell test $(CHPL_MINOR) -ge 31 && echo yes)
+CHPL_VERSION_WARN := $(shell test $(CHPL_MINOR) -le 31 && echo yes)
 .PHONY: check-chpl
 check-chpl:
 ifneq ($(CHPL_VERSION_OK),yes)
-	$(error Chapel 1.30.0 or newer is required)
+	$(error Chapel 1.31.0 or newer is required)
 endif
 ifeq ($(CHPL_VERSION_WARN),yes)
-	$(warning Chapel 1.31.0 or newer is recommended)
+	$(warning Chapel 1.32.0 or newer is recommended)
 endif
 
 ZMQ_CHECK = $(DEP_INSTALL_DIR)/checkZMQ.chpl
@@ -328,11 +328,6 @@ ifeq ($(shell expr $(CHPL_MINOR) \= 31),1)
 	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/eq-131
 endif
 
-ifeq ($(shell expr $(CHPL_MINOR) \= 30),1)
-	CHPL_COMPAT_FLAGS += -sbigintInitThrows=true
-	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/e-130
-endif
-
 MODULE_GENERATION_SCRIPT=$(ARKOUDA_SOURCE_DIR)/serverModuleGen.py
 # This is the main compilation statement section
 $(ARKOUDA_MAIN_MODULE): check-deps $(ARROW_O) $(ARKOUDA_SOURCES) $(ARKOUDA_MAKEFILES)
@@ -421,7 +416,7 @@ doc-server: ${DOC_DIR} $(DOC_SERVER_OUTPUT_DIR)/index.html
 $(DOC_SERVER_OUTPUT_DIR)/index.html: $(ARKOUDA_SOURCES) $(ARKOUDA_MAKEFILES) | $(DOC_SERVER_OUTPUT_DIR)
 	@echo "Building documentation for: Server"
 	@# Build the documentation to the Chapel output directory
-	$(CHPLDOC) $(CHPLDOC_FLAGS) $(ARKOUDA_MAIN_SOURCE) $(ARKOUDA_SOURCE_DIR)/compat/e-130/* -o $(DOC_SERVER_OUTPUT_DIR)
+	$(CHPLDOC) $(CHPLDOC_FLAGS) $(ARKOUDA_MAIN_SOURCE) $(ARKOUDA_SOURCE_DIR)/compat/eq-131/* -o $(DOC_SERVER_OUTPUT_DIR)
 	@# Create the .nojekyll file needed for github pages in the  Chapel output directory
 	touch $(DOC_SERVER_OUTPUT_DIR)/.nojekyll
 	@echo "Completed building documentation for: Server"

diff --git a/dep/checkArrow.chpl b/dep/checkArrow.chpl
@@ -1,6 +1,5 @@
 use IO;
 use ArkoudaCTypesCompat;
-use ArkoudaStringBytesCompat;
 
 require "../src/ArrowFunctions.h";
 require "../src/ArrowFunctions.o";

diff --git a/src/BigIntMsg.chpl b/src/BigIntMsg.chpl
@@ -11,7 +11,6 @@ module BigIntMsg {
     use BigInteger;
     use List;
 
-    use ArkoudaListCompat;
     use ArkoudaIOCompat;
 
     private config const logLevel = ServerConfig.logLevel;

diff --git a/src/CSVMsg.chpl b/src/CSVMsg.chpl
@@ -18,7 +18,6 @@ module CSVMsg {
     use Set;
 
     use ArkoudaFileCompat;
-    use ArkoudaListCompat;
     use ArkoudaIOCompat;
 
     const CSV_HEADER_OPEN = "**HEADER**";

diff --git a/src/Codecs.chpl b/src/Codecs.chpl
@@ -5,7 +5,6 @@ module Codecs {
   use AryUtil;
 
   use ArkoudaCTypesCompat;
-  use ArkoudaStringBytesCompat;
   use CTypes;
 
   proc encodeStr(obj: c_ptr(uint(8)), inBufSize: int, outBufSize: int, toEncoding: string = "UTF-8", fromEncoding: string = "UTF-8"): [] uint(8) throws {

diff --git a/src/EfuncMsg.chpl b/src/EfuncMsg.chpl
@@ -18,7 +18,6 @@ module EfuncMsg
 
     use AryUtil;
 
-    use ArkoudaBitOpsCompat;
     use ArkoudaMathCompat;
 
     private config const logLevel = ServerConfig.logLevel;

diff --git a/src/ExternalIntegration.chpl b/src/ExternalIntegration.chpl
@@ -7,8 +7,6 @@ module ExternalIntegration {
     use ServerConfig;
     use ServerErrors;
 
-    use ArkoudaListCompat;
-
     private config const logLevel = ServerConfig.logLevel;
     private config const logChannel = ServerConfig.logChannel;
     const eiLogger = new Logger(logLevel, logChannel);

diff --git a/src/GenSymIO.chpl b/src/GenSymIO.chpl
@@ -20,8 +20,6 @@ module GenSymIO {
     use CTypes;
     use ArkoudaMapCompat;
 
-    use ArkoudaListCompat;
-    use ArkoudaStringBytesCompat;
     use ArkoudaCTypesCompat;
     use ArkoudaIOCompat;
 

diff --git a/src/HDF5Msg.chpl b/src/HDF5Msg.chpl
@@ -28,8 +28,6 @@ module HDF5Msg {
 
     use BigInteger;
 
-    use ArkoudaListCompat;
-    use ArkoudaStringBytesCompat;
     use ArkoudaCTypesCompat;
     use ArkoudaIOCompat;
 

diff --git a/src/Message.chpl b/src/Message.chpl
@@ -9,7 +9,6 @@ module Message {
 
     use ArkoudaFileCompat;
     use Map;
-    use ArkoudaListCompat;
     use ArkoudaIOCompat;
 
     enum MsgType {NORMAL,WARNING,ERROR}

diff --git a/src/MetricsMsg.chpl b/src/MetricsMsg.chpl
@@ -13,7 +13,6 @@ module MetricsMsg {
     use Map;
     use ArkoudaTimeCompat as Time;
 
-    use ArkoudaListCompat;
     use ArkoudaMapCompat;
     use ArkoudaIOCompat;
 

diff --git a/src/MultiTypeRegEntry.chpl b/src/MultiTypeRegEntry.chpl
@@ -15,7 +15,6 @@ module MultiTypeRegEntry {
     use NumPyDType;
 
     use ArkoudaIOCompat;
-    use ArkoudaListCompat;
     use ArkoudaMapCompat;
 
     private config const logLevel = ServerConfig.logLevel;

diff --git a/src/ParquetMsg.chpl b/src/ParquetMsg.chpl
@@ -19,8 +19,6 @@ module ParquetMsg {
 
   use Map;
   use ArkoudaCTypesCompat;
-  use ArkoudaListCompat;
-  use ArkoudaStringBytesCompat;
   use ArkoudaIOCompat;
 
   enum CompressionType {

diff --git a/src/RegistrationMsg.chpl b/src/RegistrationMsg.chpl
@@ -23,7 +23,6 @@ module RegistrationMsg {
     use GenSymIO;
 
     use ArkoudaIOCompat;
-    use ArkoudaListCompat;
     use ArkoudaMapCompat;
 
     private config const logLevel = ServerConfig.logLevel;

diff --git a/src/Registry.chpl b/src/Registry.chpl
@@ -9,7 +9,6 @@ module Registry {
     use ServerErrors;
     use Logging;
     use ArkoudaMapCompat;
-    use ArkoudaListCompat;
 
     private config const logLevel = ServerConfig.logLevel;
     private config const logChannel = ServerConfig.logChannel;

diff --git a/src/SegStringSort.chpl b/src/SegStringSort.chpl
@@ -11,7 +11,6 @@ module SegStringSort {
   use ServerConfig;
   use BlockDist;
 
-  use ArkoudaStringBytesCompat;
   use ArkoudaBlockCompat;
 
   private config const SSS_v = false;

diff --git a/src/SegmentedMsg.chpl b/src/SegmentedMsg.chpl
@@ -16,7 +16,6 @@ module SegmentedMsg {
   use SegmentedArray;
 
   use Map;
-  use ArkoudaStringBytesCompat;
   use ArkoudaRangeCompat;
   use ArkoudaCTypesCompat;
   use ArkoudaIOCompat;

diff --git a/src/SegmentedString.chpl b/src/SegmentedString.chpl
@@ -22,7 +22,6 @@ module SegmentedString {
   use FileSystem;
 
   use ArkoudaRegexCompat;
-  use ArkoudaStringBytesCompat;
   use ArkoudaRangeCompat;
 
   private config const logLevel = ServerConfig.logLevel;

diff --git a/src/ServerConfig.chpl b/src/ServerConfig.chpl
@@ -17,7 +17,6 @@ module ServerConfig
 
     use ArkoudaFileCompat;
     private use ArkoudaCTypesCompat;
-    use ArkoudaStringBytesCompat;
 
     enum Deployment {STANDARD,KUBERNETES}
 

diff --git a/src/ServerDaemon.chpl b/src/ServerDaemon.chpl
@@ -28,7 +28,6 @@ module ServerDaemon {
     use StatusMsg;
 
     use ArkoudaFileCompat;
-    use ArkoudaListCompat;
     use ArkoudaIOCompat;
 
     enum ServerDaemonType {DEFAULT,INTEGRATION,METRICS,STATUS}

diff --git a/src/TransferMsg.chpl b/src/TransferMsg.chpl
@@ -14,8 +14,6 @@ module TransferMsg
     use ServerErrorStrings;
 
     use SegmentedString;
-    use ArkoudaListCompat;
-    use ArkoudaStringBytesCompat;
     use ArkoudaCTypesCompat;
 
     proc sendDataFrameSetupInfo(port:string, numColumns: int, elements: string) throws {

diff --git a/src/compat/e-130/ArkoudaAggCompat.chpl b/src/compat/e-130/ArkoudaAggCompat.chpl
diff --git a/src/compat/e-130/ArkoudaBigIntCompat.chpl b/src/compat/e-130/ArkoudaBigIntCompat.chpl
diff --git a/src/compat/e-130/ArkoudaBitOpsCompat.chpl b/src/compat/e-130/ArkoudaBitOpsCompat.chpl
diff --git a/src/compat/e-130/ArkoudaBlockCompat.chpl b/src/compat/e-130/ArkoudaBlockCompat.chpl