-
Notifications
You must be signed in to change notification settings - Fork 447
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[VL] Minor follow-ups for PRs (#6693)
- Loading branch information
1 parent
d746f0f
commit 0625a75
Showing
8 changed files
with
175 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| #include <limits> | ||
|
|
||
| #include "utils/VeloxBatchResizer.h" | ||
| #include "velox/vector/tests/utils/VectorTestBase.h" | ||
|
|
||
| using namespace facebook::velox; | ||
|
|
||
| namespace gluten { | ||
| class ColumnarBatchArray : public ColumnarBatchIterator { | ||
| public: | ||
| explicit ColumnarBatchArray(const std::vector<std::shared_ptr<ColumnarBatch>> batches) | ||
| : batches_(std::move(batches)) {} | ||
|
|
||
| std::shared_ptr<ColumnarBatch> next() override { | ||
| if (cursor_ >= batches_.size()) { | ||
| return nullptr; | ||
| } | ||
| return batches_[cursor_++]; | ||
| } | ||
|
|
||
| private: | ||
| const std::vector<std::shared_ptr<ColumnarBatch>> batches_; | ||
| int32_t cursor_ = 0; | ||
| }; | ||
|
|
||
| class VeloxBatchResizerTest : public ::testing::Test, public test::VectorTestBase { | ||
| protected: | ||
| static void SetUpTestCase() { | ||
| memory::MemoryManager::testingSetInstance({}); | ||
| } | ||
|
|
||
| RowVectorPtr newVector(size_t numRows) { | ||
| auto constant = makeConstant(1, numRows); | ||
| auto out = | ||
| std::make_shared<RowVector>(pool(), ROW({INTEGER()}), nullptr, numRows, std::vector<VectorPtr>{constant}); | ||
| return out; | ||
| } | ||
|
|
||
| void checkResize(int32_t min, int32_t max, std::vector<int32_t> inSizes, std::vector<int32_t> outSizes) { | ||
| auto inBatches = std::vector<std::shared_ptr<ColumnarBatch>>(); | ||
| for (const auto& size : inSizes) { | ||
| inBatches.push_back(std::make_shared<VeloxColumnarBatch>(newVector(size))); | ||
| } | ||
| VeloxBatchResizer resizer(pool(), min, max, std::make_unique<ColumnarBatchArray>(std::move(inBatches))); | ||
| auto actualOutSizes = std::vector<int32_t>(); | ||
| while (true) { | ||
| auto next = resizer.next(); | ||
| if (next == nullptr) { | ||
| break; | ||
| } | ||
| actualOutSizes.push_back(next->numRows()); | ||
| } | ||
| ASSERT_EQ(actualOutSizes, outSizes); | ||
| } | ||
| }; | ||
|
|
||
| TEST_F(VeloxBatchResizerTest, sanity) { | ||
| checkResize(100, std::numeric_limits<int32_t>::max(), {30, 50, 30, 40, 30}, {110, 70}); | ||
| checkResize(1, 40, {10, 20, 50, 30, 40, 30}, {10, 20, 40, 10, 30, 40, 30}); | ||
| checkResize(1, 39, {10, 20, 50, 30, 40, 30}, {10, 20, 39, 11, 30, 39, 1, 30}); | ||
| checkResize(40, 40, {10, 20, 50, 30, 40, 30}, {30, 40, 10, 30, 40, 30}); | ||
| checkResize(39, 39, {10, 20, 50, 30, 40, 30}, {30, 39, 11, 30, 39, 1, 30}); | ||
| checkResize(100, 200, {5, 900, 50}, {5, 200, 200, 200, 200, 100, 50}); | ||
| checkResize(100, 200, {5, 900, 30, 80}, {5, 200, 200, 200, 200, 100, 110}); | ||
| checkResize(100, 200, {5, 900, 700}, {5, 200, 200, 200, 200, 100, 200, 200, 200, 100}); | ||
| ASSERT_ANY_THROW(checkResize(0, 0, {}, {})); | ||
| } | ||
| } // namespace gluten |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
tools/gluten-it/common/src/main/java/org/apache/gluten/integration/SparkJvmOptions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * 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.gluten.integration; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| public class SparkJvmOptions { | ||
| private static final String MODULE_OPTIONS_CLASS_NAME = "org.apache.spark.launcher.JavaModuleOptions"; | ||
|
|
||
| public static String read() { | ||
| try { | ||
| final Class<?> clazz = Class.forName("org.apache.spark.launcher.JavaModuleOptions"); | ||
| final Method method = clazz.getMethod("defaultModuleOptions"); | ||
| return (String) method.invoke(null); | ||
| } catch (ClassNotFoundException e) { | ||
| // Could happen in Spark 3.2 which doesn't have this class yet. | ||
| return ""; | ||
| } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| public static void main(String[] args) { | ||
| System.out.println(read()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters