Skip to content
Closed
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
14 changes: 14 additions & 0 deletions .github/workflows/cpp_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,18 @@ jobs:
test-compile exec:java \
-Dexec.classpathScope="test" \
-Dexec.mainClass="org.apache.celeborn.service.deploy.cluster.CppWriteJavaReadTestWithNONE" \
-Dexec.args="-XX:MaxDirectMemorySize=2G"
- name: Run Cpp-Write Java-Read Hybrid Integration Test (LZ4 Compression)
run: |
build/mvn -pl worker \
test-compile exec:java \
-Dexec.classpathScope="test" \
-Dexec.mainClass="org.apache.celeborn.service.deploy.cluster.CppWriteJavaReadTestWithLZ4" \
-Dexec.args="-XX:MaxDirectMemorySize=2G"
- name: Run Cpp-Write Java-Read Hybrid Integration Test (ZSTD Compression)
run: |
build/mvn -pl worker \
test-compile exec:java \
-Dexec.classpathScope="test" \
-Dexec.mainClass="org.apache.celeborn.service.deploy.cluster.CppWriteJavaReadTestWithZSTD" \
-Dexec.args="-XX:MaxDirectMemorySize=2G"
8 changes: 6 additions & 2 deletions cpp/celeborn/tests/DataSumWithWriterClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
int main(int argc, char** argv) {
folly::init(&argc, &argv, false);
// Read the configs.
assert(argc == 9);
assert(argc == 10);
std::string lifecycleManagerHost = argv[1];
int lifecycleManagerPort = std::atoi(argv[2]);
std::string appUniqueId = argv[3];
Expand All @@ -34,16 +34,20 @@ int main(int argc, char** argv) {
int numMappers = std::atoi(argv[6]);
int numPartitions = std::atoi(argv[7]);
std::string resultFile = argv[8];
std::string compressCodec = argv[9];
std::cout << "lifecycleManagerHost = " << lifecycleManagerHost
<< ", lifecycleManagerPort = " << lifecycleManagerPort
<< ", appUniqueId = " << appUniqueId
<< ", shuffleId = " << shuffleId << ", attemptId = " << attemptId
<< ", numMappers = " << numMappers
<< ", numPartitions = " << numPartitions
<< ", resultFile = " << resultFile << std::endl;
<< ", resultFile = " << resultFile
<< ", compressCodec = " << compressCodec << std::endl;

// Create shuffleClient and setup.
auto conf = std::make_shared<celeborn::conf::CelebornConf>();
conf->registerProperty(
celeborn::conf::CelebornConf::kShuffleCompressionCodec, compressCodec);
auto clientEndpoint =
std::make_shared<celeborn::client::ShuffleClientEndpoint>(conf);
auto shuffleClient = celeborn::client::ShuffleClientImpl::create(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.celeborn.service.deploy.cluster

import org.apache.celeborn.common.protocol.CompressionCodec

object CppWriteJavaReadTestWithLZ4 extends JavaCppHybridReadWriteTestBase {

def main(args: Array[String]) = {
testCppWriteJavaRead(CompressionCodec.LZ4)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.celeborn.service.deploy.cluster

import org.apache.celeborn.common.protocol.CompressionCodec

object CppWriteJavaReadTestWithZSTD extends JavaCppHybridReadWriteTestBase {

def main(args: Array[String]) = {
testCppWriteJavaRead(CompressionCodec.ZSTD)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,10 @@ trait JavaCppHybridReadWriteTestBase extends AnyFunSuite
val cppBinRelativeDirectory = "cpp/build/celeborn/tests/"
val cppBinFileName = "cppDataSumWithWriterClient"
val cppBinFilePath = s"$projectDirectory/$cppBinRelativeDirectory/$cppBinFileName"
// Execution command: $exec lifecycleManagerHost lifecycleManagerPort appUniqueId shuffleId attemptId numMappers numPartitions cppResultFile
val cppCodec = codec.name()
// Execution command: $exec lifecycleManagerHost lifecycleManagerPort appUniqueId shuffleId attemptId numMappers numPartitions cppResultFile cppCodec
val command = {
s"$cppBinFilePath $lifecycleManagerHost $lifecycleManagerPort $appUniqueId $shuffleId $attemptId $numMappers $numPartitions $cppResultFile"
s"$cppBinFilePath $lifecycleManagerHost $lifecycleManagerPort $appUniqueId $shuffleId $attemptId $numMappers $numPartitions $cppResultFile $cppCodec"
}
println(s"run command: $command")
val commandOutput = runCommand(command)
Expand Down
Loading