Skip to content
Draft
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
2 changes: 1 addition & 1 deletion src/ArgSortMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module ArgSortMsg

use Time;
use Math only;
private use ArkoudaSortCompat;
private use Sort;
private use DynamicSort;

use Reflection only;
Expand Down
2 changes: 1 addition & 1 deletion src/CheckpointMsg.chpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module CheckpointMsg {
use FileSystem;
use List;
use ArkoudaJSONCompat;
use JSON;
import IO, Path, Time;
import Reflection.{getModuleName as M,
getRoutineName as R,
Expand Down
6 changes: 3 additions & 3 deletions src/DynamicSort.chpl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module DynamicSort {
private use ArkoudaSortCompat;
private use Sort;

proc dynamicTwoArrayRadixSort(ref Data:[], comparator:?rec=new defaultComparator()) {
if Data._instance.isDefaultRectangular() {
ArkoudaSortCompat.TwoArrayRadixSort.twoArrayRadixSort(Data, comparator);
Sort.TwoArrayRadixSort.twoArrayRadixSort(Data, comparator);
} else {
ArkoudaSortCompat.sort(Data, comparator);
Sort.sort(Data, comparator);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/RadixSortLSD.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module RadixSortLSD
use RangeChunk;
use Logging;
use ServerConfig;
use ArkoudaSortCompat except isSorted;
use Sort except isSorted;

private config const logLevel = ServerConfig.logLevel;
private config const logChannel = ServerConfig.logChannel;
Expand Down
2 changes: 1 addition & 1 deletion src/RandMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module RandMsg
use PrivateDist;
use RandArray;
use RandUtil;
use ArkoudaSortCompat;
use Sort;
use CommAggregation;
use Repartition;
use ZigguratConstants;
Expand Down
2 changes: 1 addition & 1 deletion src/RandUtil.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module RandUtil {
where D.rank == 1 {
// use a fixed number of elements per stream instead of relying on number of locales or numTasksPerLoc because these
// can vary from run to run / machine to mahchine. And it's important for the same seed to give the same results
use ArkoudaTimeCompat;
use Time;
var next: rng.eltType;
if hasSeed {
next = rng.next();
Expand Down
2 changes: 1 addition & 1 deletion src/SegStringSort.chpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module SegStringSort {
use SegmentedString;
use ArkoudaSortCompat;
use Sort;
use Time;
use IO;
use CTypes;
Expand Down
2 changes: 1 addition & 1 deletion src/SortMsg.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SortMsg

use Time;
use Math only;
use ArkoudaSortCompat only relativeComparator;
use Sort only relativeComparator;
private use DynamicSort;
use Search only;
use Reflection;
Expand Down
3 changes: 0 additions & 3 deletions src/compat/ge-24/ArkoudaJSONCompat.chpl

This file was deleted.

3 changes: 0 additions & 3 deletions src/compat/ge-24/ArkoudaSortCompat.chpl

This file was deleted.

3 changes: 0 additions & 3 deletions src/compat/ge-24/ArkoudaTimeCompat.chpl

This file was deleted.