Skip to content

Commit

Permalink
Drop support for Chapel 131 (Bears-R-Us#3303)
Browse files Browse the repository at this point in the history
Chapel 1.31 is no longer in need for support and was causing some
compatability changes with some new code, so we've made the
decision to drop 1.31.
  • Loading branch information
bmcdonald3 authored Jun 6, 2024
1 parent 0ceb566 commit 4a628b8
Show file tree
Hide file tree
Showing 20 changed files with 5 additions and 615 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
chpl-version: ['1.31.0', '1.32.0']
chpl-version: ['1.32.0']
container:
image: chapel/chapel:${{matrix.chpl-version}}
steps:
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
chpl-version: ['1.31.0', '1.32.0']
chpl-version: ['1.32.0']
container:
image: chapel/chapel:${{matrix.chpl-version}}
steps:
Expand Down
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ $(ARROW_O): $(ARROW_CPP) $(ARROW_H)

CHPL_MAJOR := $(shell $(CHPL) --version | sed -n "s/chpl version \([0-9]\)\.[0-9]*.*/\1/p")
CHPL_MINOR := $(shell $(CHPL) --version | sed -n "s/chpl version [0-9]\.\([0-9]*\).*/\1/p")
CHPL_VERSION_OK := $(shell test $(CHPL_MAJOR) -ge 2 -o $(CHPL_MINOR) -ge 31 && echo yes)
CHPL_VERSION_WARN := $(shell test $(CHPL_MAJOR) -eq 1 -a $(CHPL_MINOR) -le 32 && echo yes)
CHPL_VERSION_OK := $(shell test $(CHPL_MAJOR) -ge 2 -o $(CHPL_MINOR) -ge 32 && echo yes)
CHPL_VERSION_WARN := $(shell test $(CHPL_MAJOR) -eq 1 -a $(CHPL_MINOR) -le 33 && echo yes)
.PHONY: check-chpl
check-chpl:
ifneq ($(CHPL_VERSION_OK),yes)
$(error Chapel 1.31.0 or newer is required, found $(CHPL_MAJOR).$(CHPL_MINOR))
$(error Chapel 1.32.0 or newer is required, found $(CHPL_MAJOR).$(CHPL_MINOR))
endif
ifeq ($(CHPL_VERSION_WARN),yes)
$(warning Chapel 1.33.0 or newer is recommended, found $(CHPL_MAJOR).$(CHPL_MINOR))
Expand Down Expand Up @@ -339,11 +339,6 @@ ifeq ($(shell expr $(CHPL_MINOR) \= 32),1)
ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/e-132
endif

ifeq ($(shell expr $(CHPL_MINOR) \= 31),1)
CHPL_COMPAT_FLAGS += -sbigintInitThrows=true
ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/eq-131
endif

ifeq ($(shell expr $(CHPL_MINOR) \> 33),1)
ARKOUDA_RW_DEFAULT_FLAG := -sOpenReaderLockingDefault=false -sOpenWriterLockingDefault=false
endif
Expand Down
5 changes: 0 additions & 5 deletions src/compat/eq-131/ArkoudaAggCompat.chpl

This file was deleted.

115 changes: 0 additions & 115 deletions src/compat/eq-131/ArkoudaAryUtilCompat.chpl

This file was deleted.

23 changes: 0 additions & 23 deletions src/compat/eq-131/ArkoudaBigIntCompat.chpl

This file was deleted.

9 changes: 0 additions & 9 deletions src/compat/eq-131/ArkoudaBlockCompat.chpl

This file was deleted.

5 changes: 0 additions & 5 deletions src/compat/eq-131/ArkoudaCTypesCompat.chpl

This file was deleted.

10 changes: 0 additions & 10 deletions src/compat/eq-131/ArkoudaFileCompat.chpl

This file was deleted.

82 changes: 0 additions & 82 deletions src/compat/eq-131/ArkoudaIOCompat.chpl

This file was deleted.

7 changes: 0 additions & 7 deletions src/compat/eq-131/ArkoudaMapCompat.chpl

This file was deleted.

11 changes: 0 additions & 11 deletions src/compat/eq-131/ArkoudaMathCompat.chpl

This file was deleted.

3 changes: 0 additions & 3 deletions src/compat/eq-131/ArkoudaMemDiagnosticsCompat.chpl

This file was deleted.

3 changes: 0 additions & 3 deletions src/compat/eq-131/ArkoudaPOSIXCompat.chpl

This file was deleted.

Loading

0 comments on commit 4a628b8

Please sign in to comment.