Skip to content

Commit 5d7a198

Browse files
qkoziolqkoziol
authored
Merge branch 'HDFGroup:develop' into develop
2 parents 0521c27 + 985df02 commit 5d7a198

File tree

4,409 files changed

+714347
-286432
lines changed

Some content is hidden

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

4,409 files changed

+714347
-286432
lines changed

‎.autom4te.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# This file is part of HDF5. The full HDF5 copyright notice, including
55
# terms governing use, modification, and redistribution, is contained in
6-
# the COPYING file, which can be found at the root of the source code
6+
# the LICENSE file, which can be found at the root of the source code
77
# distribution tree, or in https://www.hdfgroup.org/licenses.
88
# If you do not have access to either file, you may request a copy from
99
# [email protected].

‎.clang-format‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BraceWrapping:
1111
BreakBeforeBraces: Stroustrup
1212
BreakAfterJavaFieldAnnotations: true
1313
BreakStringLiterals: true
14-
ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also
14+
ColumnLimit: 110
1515
IndentWidth: 4
1616
---
1717
Language: Cpp
@@ -58,35 +58,46 @@ IndentCaseLabels: true
5858
IndentGotoLabels: false
5959
#llvm11: IndentExternBlock: AfterExternBlock
6060
#llvm11: InsertTrailingCommas: None
61-
MacroBlockBegin: "^BEGIN_FUNC"
62-
MacroBlockEnd: "^END_FUNC"
61+
MacroBlockBegin: "^H5_BEFORE_USER_CB*|^H5E_PAUSE_ERRORS"
62+
MacroBlockEnd: "^H5_AFTER_USER_CB*|^H5E_RESUME_ERRORS"
6363
ObjCBlockIndentWidth: 4
6464
#llvm11: ObjCBreakBeforeNestedBlockParam: true
6565
ReflowComments: true
6666
SortIncludes: false
6767
StatementMacros:
68+
- CATCH
69+
- END_MEMBERS
6870
- FUNC_ENTER_API
69-
- FUNC_LEAVE_API
71+
- FUNC_ENTER_API_NAMECHECK_ONLY
72+
- FUNC_ENTER_NOAPI
73+
- FUNC_ENTER_NOAPI_NAMECHECK_ONLY
74+
- FUNC_ENTER_NOAPI_NOERR
75+
- FUNC_ENTER_NOAPI_NOINIT
7076
- FUNC_ENTER_NOAPI_NOINIT_NOERR
77+
- FUNC_ENTER_PACKAGE
78+
- FUNC_LEAVE_API
79+
- FUNC_LEAVE_API_NAMECHECK_ONLY
7180
- FUNC_LEAVE_NOAPI
81+
- FUNC_LEAVE_NOAPI_NAMECHECK_ONLY
82+
- FUNC_LEAVE_NOAPI_VOID_NAMECHECK_ONLY
83+
- FUNC_LEAVE_NOAPI_NOFS
84+
- H5E_BEGIN_TRY
85+
- H5E_END_TRY
7286
- H5_BEGIN_TAG
73-
- HGOTO_DONE_TAG
7487
- H5_END_TAG
75-
- HSYS_DONE_ERROR
76-
- HSYS_GOTO_ERROR
77-
- HDONE_ERROR
78-
- HERROR
88+
- H5_GCC_DIAG_OFF
89+
- H5_GCC_DIAG_ON
90+
- H5_CLANG_DIAG_OFF
91+
- H5_CLANG_DIAG_ON
92+
- H5_GCC_CLANG_DIAG_OFF
93+
- H5_GCC_CLANG_DIAG_ON
7994
- H5_LEAVE
80-
- H5E_PRINTF
81-
- H5E_THROW
8295
- HGOTO_DONE
83-
- HGOTO_ERROR
84-
- HMPI_ERROR
8596
- HMPI_DONE_ERROR
97+
- HMPI_ERROR
8698
- HMPI_GOTO_ERROR
87-
- H5_GCC_DIAG_OFF
88-
- H5_GCC_DIAG_ON
89-
- CATCH
99+
- HSYS_DONE_ERROR
100+
- HSYS_GOTO_ERROR
90101
#llvm10: TypenameMacros:
91102
#llvm10: - STACK_OF
92103
#llvm10: - LIST

‎.codespellrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ref: https://github.com/codespell-project/codespell#using-a-config-file
2+
[codespell]
3+
skip = .git,*.svg,.codespellrc,./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./config/sanitizer/sanitizers.cmake,./tools/test/h5import/testfiles/*.conf,./tools/test/h5repack/testfiles/*.dat,./test/API/driver,./configure,./bin/ltmain.sh,./bin/depcomp,./bin/config.guess,./bin/config.sub,./autom4te.cache,./m4/libtool.m4,./c++/src/*.html,./HDF5Examples/depcomp,./release_docs/HISTORY-*.txt
4+
check-hidden = true
5+
# ignore-regex =
6+
ignore-words-list = ot,isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,ake,gord,numer,ro,oce,msdos,TEXTIN,indx,FLE

‎.devcontainer/Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM mcr.microsoft.com/devcontainers/base:debian
2+
3+
RUN apt-get update && apt-get -y install --no-install-recommends \
4+
build-essential cmake cmake-curses-gui doxygen git graphviz \
5+
less libtool-bin libyajl-dev mpi-default-dev ninja-build valgrind wget

‎.devcontainer/devcontainer.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "HDF5 Developer",
3+
"build": {
4+
"context": "..",
5+
"dockerfile": "Dockerfile"
6+
},
7+
"customizations": {
8+
"vscode": {
9+
"extensions": [
10+
"ms-python.python",
11+
"ms-toolsai.jupyter",
12+
"ms-vscode.cpptools",
13+
"ms-vscode.live-server",
14+
"ms-vscode-remote.remote-containers",
15+
"ms-azuretools.vscode-docker",
16+
"h5web.vscode-h5web",
17+
"davidanson.vscode-markdownlint"
18+
],
19+
"settings": {
20+
"C_Cpp.default.cppStandard": "c++17",
21+
"C_Cpp.default.cStandard": "c99",
22+
"terminal.integrated.shell.linux": "/bin/bash"
23+
}
24+
}
25+
}
26+
}

‎.devcontainer/noop.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This file is copied into the container along with environment.yml* from the
2+
parent folder. This file prevents the Dockerfile COPY instruction from failing
3+
if no environment.yml is found.

0 commit comments

Comments
 (0)