Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Chapel 1.30 #2844

Merged
merged 7 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -65,7 +65,7 @@ jobs:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
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 }}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
15 changes: 5 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion dep/checkArrow.chpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use IO;
use ArkoudaCTypesCompat;
use ArkoudaStringBytesCompat;

require "../src/ArrowFunctions.h";
require "../src/ArrowFunctions.o";
Expand Down
1 change: 0 additions & 1 deletion src/BigIntMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module BigIntMsg {
use BigInteger;
use List;

use ArkoudaListCompat;
use ArkoudaIOCompat;

private config const logLevel = ServerConfig.logLevel;
Expand Down
1 change: 0 additions & 1 deletion src/CSVMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module CSVMsg {
use Set;

use ArkoudaFileCompat;
use ArkoudaListCompat;
use ArkoudaIOCompat;

const CSV_HEADER_OPEN = "**HEADER**";
Expand Down
1 change: 0 additions & 1 deletion src/Codecs.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/EfuncMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module EfuncMsg

use AryUtil;

use ArkoudaBitOpsCompat;
use ArkoudaMathCompat;

private config const logLevel = ServerConfig.logLevel;
Expand Down
2 changes: 0 additions & 2 deletions src/ExternalIntegration.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/GenSymIO.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module GenSymIO {
use CTypes;
use ArkoudaMapCompat;

use ArkoudaListCompat;
use ArkoudaStringBytesCompat;
use ArkoudaCTypesCompat;
use ArkoudaIOCompat;

Expand Down
2 changes: 0 additions & 2 deletions src/HDF5Msg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ module HDF5Msg {

use BigInteger;

use ArkoudaListCompat;
use ArkoudaStringBytesCompat;
use ArkoudaCTypesCompat;
use ArkoudaIOCompat;

Expand Down
1 change: 0 additions & 1 deletion src/Message.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module Message {

use ArkoudaFileCompat;
use Map;
use ArkoudaListCompat;
use ArkoudaIOCompat;

enum MsgType {NORMAL,WARNING,ERROR}
Expand Down
1 change: 0 additions & 1 deletion src/MetricsMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module MetricsMsg {
use Map;
use ArkoudaTimeCompat as Time;

use ArkoudaListCompat;
use ArkoudaMapCompat;
use ArkoudaIOCompat;

Expand Down
1 change: 0 additions & 1 deletion src/MultiTypeRegEntry.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module MultiTypeRegEntry {
use NumPyDType;

use ArkoudaIOCompat;
use ArkoudaListCompat;
use ArkoudaMapCompat;

private config const logLevel = ServerConfig.logLevel;
Expand Down
2 changes: 0 additions & 2 deletions src/ParquetMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ module ParquetMsg {

use Map;
use ArkoudaCTypesCompat;
use ArkoudaListCompat;
use ArkoudaStringBytesCompat;
use ArkoudaIOCompat;

enum CompressionType {
Expand Down
1 change: 0 additions & 1 deletion src/RegistrationMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module RegistrationMsg {
use GenSymIO;

use ArkoudaIOCompat;
use ArkoudaListCompat;
use ArkoudaMapCompat;

private config const logLevel = ServerConfig.logLevel;
Expand Down
1 change: 0 additions & 1 deletion src/Registry.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/SegStringSort.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module SegStringSort {
use ServerConfig;
use BlockDist;

use ArkoudaStringBytesCompat;
use ArkoudaBlockCompat;

private config const SSS_v = false;
Expand Down
1 change: 0 additions & 1 deletion src/SegmentedMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module SegmentedMsg {
use SegmentedArray;

use Map;
use ArkoudaStringBytesCompat;
use ArkoudaRangeCompat;
use ArkoudaCTypesCompat;
use ArkoudaIOCompat;
Expand Down
1 change: 0 additions & 1 deletion src/SegmentedString.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module SegmentedString {
use FileSystem;

use ArkoudaRegexCompat;
use ArkoudaStringBytesCompat;
use ArkoudaRangeCompat;

private config const logLevel = ServerConfig.logLevel;
Expand Down
1 change: 0 additions & 1 deletion src/ServerConfig.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module ServerConfig

use ArkoudaFileCompat;
private use ArkoudaCTypesCompat;
use ArkoudaStringBytesCompat;

enum Deployment {STANDARD,KUBERNETES}

Expand Down
1 change: 0 additions & 1 deletion src/ServerDaemon.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ module ServerDaemon {
use StatusMsg;

use ArkoudaFileCompat;
use ArkoudaListCompat;
use ArkoudaIOCompat;

enum ServerDaemonType {DEFAULT,INTEGRATION,METRICS,STATUS}
Expand Down
2 changes: 0 additions & 2 deletions src/TransferMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions src/compat/e-130/ArkoudaAggCompat.chpl

This file was deleted.

52 changes: 0 additions & 52 deletions src/compat/e-130/ArkoudaBigIntCompat.chpl

This file was deleted.

7 changes: 0 additions & 7 deletions src/compat/e-130/ArkoudaBitOpsCompat.chpl

This file was deleted.

10 changes: 0 additions & 10 deletions src/compat/e-130/ArkoudaBlockCompat.chpl

This file was deleted.

Loading