Skip to content

[GLUTEN-10452][VL] Remove QAT support #10489

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.

Sign up for GitHub

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

Closed
marin-ma wants to merge 1 commit into from
Closed

[GLUTEN-10452][VL] Remove QAT support #10489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ...rc-celeborn/main/java/org/apache/gluten/vectorized/CelebornPartitionWriterJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public long rtHandle() {
public native long createPartitionWriter(
int numPartitions,
String codec,
String codecBackend,
int compressionLevel,
int compressionBufferSize,
int pushBufferMaxSize,
Expand Down
3 changes: 0 additions & 3 deletions ...c-celeborn/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarBatchSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ private class CelebornColumnarBatchSerializerInstance(
} else {
null // uncompressed
}
val compressionCodecBackend =
GlutenConfig.get.columnarShuffleCodecBackend.orNull
val jniWrapper = ShuffleReaderJniWrapper.create(runtime)
val batchSize = GlutenConfig.get.maxBatchSize
val readerBufferSize = GlutenConfig.get.columnarShuffleReaderBufferSize
Expand All @@ -99,7 +97,6 @@ private class CelebornColumnarBatchSerializerInstance(
.make(
cSchema.memoryAddress(),
compressionCodec,
compressionCodecBackend,
batchSize,
readerBufferSize,
deserializerBufferSize,
Expand Down
1 change: 0 additions & 1 deletion ...src-celeborn/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ class VeloxCelebornColumnarShuffleWriter[K, V](
val partitionWriterHandle = partitionWriterJniWrapper.createPartitionWriter(
numPartitions,
compressionCodec.orNull,
GlutenConfig.get.columnarShuffleCodecBackend.orNull,
compressionLevel,
compressionBufferSize,
clientPushBufferMaxSize,
Expand Down
1 change: 0 additions & 1 deletion .../src-uniffle/main/java/org/apache/gluten/vectorized/UnifflePartitionWriterJniWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public long rtHandle() {
public native long createPartitionWriter(
int numPartitions,
String codec,
String codecBackend,
int compressionLevel,
int compressionBufferSize,
int pushBufferMaxSize,
Expand Down
6 changes: 0 additions & 6 deletions ...-uniffle/main/java/org/apache/spark/shuffle/writer/VeloxUniffleColumnarShuffleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public class VeloxUniffleColumnarShuffleWriter<K, V> extends RssShuffleWriter<K,
private boolean stopping = false;
private final double reallocThreshold = GlutenConfig.get().columnarShuffleReallocThreshold();
private String compressionCodec;
private String codecBackend;
private int compressionLevel;
private int compressionBufferSize;
private final int diskWriteBufferSize;
Expand Down Expand Up @@ -131,10 +130,6 @@ public VeloxUniffleColumnarShuffleWriter(
compressionLevel = GlutenShuffleUtils.getCompressionLevel(sparkConf, compressionCodec);
compressionBufferSize =
GlutenShuffleUtils.getCompressionBufferSize(sparkConf, compressionCodec);
Option<String> codecBackend = GlutenConfig.get().columnarShuffleCodecBackend();
if (codecBackend.isDefined()) {
this.codecBackend = codecBackend.get();
}
}
}

Expand All @@ -156,7 +151,6 @@ protected void writeImpl(Iterator<Product2<K, V>> records) {
partitionWriterJniWrapper.createPartitionWriter(
numPartitions,
compressionCodec,
codecBackend,
compressionLevel,
compressionBufferSize,
bufferSize,
Expand Down
3 changes: 0 additions & 3 deletions backends-velox/src/main/scala/org/apache/gluten/vectorized/ColumnarBatchSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ private class ColumnarBatchSerializerInstance(
} else {
null // uncompressed
}
val compressionCodecBackend =
GlutenConfig.get.columnarShuffleCodecBackend.orNull
val batchSize = GlutenConfig.get.maxBatchSize
val readerBufferSize = GlutenConfig.get.columnarShuffleReaderBufferSize
val deserializerBufferSize = GlutenConfig.get.columnarSortShuffleDeserializerBufferSize
Expand All @@ -103,7 +101,6 @@ private class ColumnarBatchSerializerInstance(
val shuffleReaderHandle = jniWrapper.make(
cSchema.memoryAddress(),
compressionCodec,
compressionCodecBackend,
batchSize,
readerBufferSize,
deserializerBufferSize,
Expand Down
1 change: 0 additions & 1 deletion backends-velox/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ class ColumnarShuffleWriter[K, V](
val partitionWriterHandle = partitionWriterJniWrapper.createPartitionWriter(
numPartitions,
compressionCodec.orNull,
GlutenConfig.get.columnarShuffleCodecBackend.orNull,
compressionLevel,
compressionBufferSize,
GlutenConfig.get.columnarShuffleCompressionThreshold,
Expand Down
1 change: 0 additions & 1 deletion cpp-ch/local-engine/tests/json/gtest_local_engine_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"spark.gluten.sql.columnar.backend.ch.runtime_config.storage_configuration.disks.hdfs.endpoint": "hdfs://127.0.0.1:8020/",
"spark.gluten.sql.columnar.backend.ch.runtime_config.storage_configuration.disks.hdfs_cache.max_size": "10Gi",
"spark.gluten.sql.columnar.backend.ch.runtime_config.storage_configuration.disks.hdfs.metadata_path": "/tmp/metadata/hdfs/3.5/",
"spark.gluten.sql.columnar.shuffle.codecBackend": "",
"spark.gluten.sql.columnar.backend.ch.runtime_config.hdfs.input_write_timeout": "180000",
"spark.gluten.memory.task.offHeap.size.in.bytes": "10737418240",
"spark.gluten.sql.columnar.backend.ch.runtime_config.storage_configuration.policies.__hdfs_main.volumes.main.disk": "hdfs_cache",
Expand Down
103 changes: 0 additions & 103 deletions cpp/CMake/BuildQATZstd.cmake
View file
Open in desktop

This file was deleted.

126 changes: 0 additions & 126 deletions cpp/CMake/BuildQATzip.cmake
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ option(BUILD_EXAMPLES "Build Examples" OFF)
option(BUILD_BENCHMARKS "Build Benchmarks" OFF)
option(ENABLE_JEMALLOC_STATS "Prints Jemalloc stats for debugging" OFF)
option(BUILD_GLOG "Build Glog from Source" OFF)
option(ENABLE_QAT "Enable QAT for de/compression" OFF)
option(ENABLE_GCS "Enable GCS" OFF)
option(ENABLE_S3 "Enable S3" OFF)
option(ENABLE_HDFS "Enable HDFS" OFF)
Expand Down Expand Up @@ -228,10 +227,6 @@ if(BUILD_TESTS OR BUILD_BENCHMARKS)
endif()
endif()

if(ENABLE_QAT)
add_definitions(-DGLUTEN_ENABLE_QAT)
endif()

if(ENABLE_GPU)
add_definitions(-DGLUTEN_ENABLE_GPU)
endif()
Expand Down
9 changes: 0 additions & 9 deletions cpp/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,6 @@ endif()
find_arrow_lib(${ARROW_LIB_NAME})
find_arrow_lib(${ARROW_BUNDLED_DEPS})

if(ENABLE_QAT)
include(BuildQATzip)
include(BuildQATZstd)
target_sources(gluten PRIVATE utils/qat/QatCodec.cc)
target_include_directories(gluten PUBLIC ${QATZIP_INCLUDE_DIR}
${QATZSTD_INCLUDE_DIR})
target_link_libraries(gluten PUBLIC qatzip::qatzip qatzstd::qatzstd)
endif()

find_protobuf()
message(STATUS "Found Protobuf: ${PROTOBUF_LIBRARY}")
target_link_libraries(gluten LINK_PUBLIC ${PROTOBUF_LIBRARY})
Expand Down
2 changes: 0 additions & 2 deletions cpp/core/config/GlutenConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,9 @@ const std::string kUGIUserName = "spark.gluten.ugi.username";
const std::string kUGITokens = "spark.gluten.ugi.tokens";

const std::string kShuffleCompressionCodec = "spark.gluten.sql.columnar.shuffle.codec";
const std::string kShuffleCompressionCodecBackend = "spark.gluten.sql.columnar.shuffle.codecBackend";
const std::string kShuffleSpillDiskWriteBufferSize = "spark.shuffle.spill.diskWriteBufferSize";
const std::string kSortShuffleReaderDeserializerBufferSize =
"spark.gluten.sql.columnar.shuffle.sort.deserializerBufferSize";
const std::string kQatBackendName = "qat";

const std::string kSparkRedactionRegex = "spark.redaction.regex";
const std::string kSparkRedactionString = "*********(redacted)";
Expand Down
11 changes: 0 additions & 11 deletions cpp/core/jni/JniCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,17 +354,6 @@ static inline arrow::Compression::type getCompressionType(JNIEnv* env, jstring c
return compressionType;
}

static inline gluten::CodecBackend getCodecBackend(JNIEnv* env, jstring codecBackendJstr) {
if (codecBackendJstr == nullptr) {
return gluten::CodecBackend::NONE;
}
auto codecBackend = jStringToCString(env, codecBackendJstr);
if (codecBackend == "qat") {
return gluten::CodecBackend::QAT;
}
throw std::invalid_argument("Not support this codec backend " + codecBackend);
}

static inline gluten::CompressionMode getCompressionMode(JNIEnv* env, jstring compressionModeJstr) {
GLUTEN_DCHECK(compressionModeJstr != nullptr, "CompressionMode cannot be null");
auto compressionMode = jStringToCString(env, compressionModeJstr);
Expand Down
Loading
Loading