Skip to content

Commit ce64989

Browse files
authored
Merge branch 'main' into main
2 parents 41e2f3c + 61a82f2 commit ce64989

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2528
-454
lines changed

.github/workflows/python.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ jobs:
147147
./tests/federated/runFedTest.sh
148148
mv .coverage .coverage.${{ matrix.test_mode }}
149149
150+
150151
- name: Cache Torch Hub
151152
if: ${{ matrix.test_mode == 'scuro' }}
152153
id: torch-cache
@@ -162,6 +163,8 @@ jobs:
162163
env:
163164
TORCH_HOME: ${{ github.workspace }}/.torch
164165
run: |
166+
df -h
167+
exit
165168
( while true; do echo "."; sleep 25; done ) &
166169
KA=$!
167170
pip install --upgrade pip wheel setuptools

src/main/java/org/apache/sysds/parser/DataExpression.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,18 @@ public void validateExpression(HashMap<String, DataIdentifier> ids, HashMap<Stri
10191019
inferredFormatType = true;
10201020
}
10211021
}
1022+
1023+
// check if file is HDF5 format (by file extension)
1024+
if (formatTypeString == null && shouldReadMTD) {
1025+
formatTypeString = MetaDataAll.checkHasHDF5Format(inputFileName);
1026+
if (formatTypeString != null) {
1027+
addVarParam(FORMAT_TYPE, new StringIdentifier(formatTypeString, this));
1028+
configObj.setFormatTypeString(formatTypeString);
1029+
inferredFormatType = true;
1030+
// HDF5 doesn't require metadata file for dimension validation
1031+
shouldReadMTD = false;
1032+
}
1033+
}
10221034

10231035
if (formatTypeString != null && formatTypeString.equalsIgnoreCase(FileFormat.MM.toString())){
10241036
/*

0 commit comments

Comments
 (0)