Skip to content

Commit

Permalink
Release 4.0
Browse files Browse the repository at this point in the history
updates for kit 105.1

Update public dependencies

Fix missing character in omni-physics.xml that prevented the code from building

Fix version number to extension version

Rgasoto/add ci
  • Loading branch information
kellyguo11 authored and rgasoto committed Apr 25, 2024
1 parent 59fe501 commit 326638c
Show file tree
Hide file tree
Showing 64 changed files with 976 additions and 506 deletions.
68 changes: 68 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: false
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine : false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: false
BreakBeforeBinaryOperators: false
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
BreakStringLiterals: false
ColumnLimit: 120
CommentPragmas: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DerivePointerBinding: false
FixNamespaceComments: false
IndentCaseLabels: false
IndentPPDirectives: AfterHash
IndentFunctionDeclarationAfterType: false
IndentWidth: 4
SortIncludes: true
IncludeCategories:
- Regex: '<carb\/.+>'
Priority: 2
- Regex: '<[[:alnum:]_.]+>'
Priority: 4
- Regex: '<[[:alnum:]_.\/]+>'
Priority: 3
- Regex: '".*"'
Priority: 1
IncludeBlocks: Regroup
Language: Cpp
MaxEmptyLinesToKeep: 2
NamespaceIndentation: None
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 0
PenaltyBreakComment: 1
PenaltyBreakFirstLessLess: 0
PenaltyBreakString: 1
PenaltyExcessCharacter: 10
PenaltyReturnTypeOnItsOwnLine: 1000
PointerAlignment: Left
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
Standard: Cpp11
ReflowComments: true
TabWidth: 4
UseTab: Never
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ _*/

# Generated license file.
PACKAGE-DEPS.yaml

.nvidia-omniverse

# Internal CI/CD files.
/.teamcity
/tools/ci
167 changes: 167 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
include:
# external
- project: 'omniverse/devplat/gitlab/templates/common/kit-extension'
file: 'modules/complete-pipeline.yml'
ref: v1_latest



# ==============================================================================================================
# More variables can be found in common.yml - here we put the ones controlling the jobs workflow
variables:
OSEC_NSPECT_ID: "NSPECT-96O5-S11L"
OSEC_CHECKMARX_ENABLED: 'false'
OSEC_GITLAB_SAST_ENABLED: 'false'
OSEC_PULSE_TRUFFLEHOG_ENABLED: 'false'
OSEC_OMNI_PULSE_ENABLED: 'false'
OSEC_README_ENABLED: 'false' # WARNING: Also have the init() function get_nspectid_from_repo_toml() in there...
ALLOW_PUBLISH_DOCS:
value: "true"
description: "Set to true to publish docs"
ALLOW_PUBLISH_TO_LAUNCHER:
value: "false"
description: "Set to true to for Kit apps that are published to the Launcher. That adds jobs for that."
ALLOW_PUBLISH_EXTENSIONS:
value: "true"
description: "Set to true to publish extension updates."
ALLOW_PUBLISH_CONTAINERS:
value: "false"
description: "Set to true to publish containers to NGC."
ALLOW_SECURITY_SCAN:
value: "false"
description: "Set to true to trigger a security scan as a child pipeline (non blocking)"
ALLOW_SCHEDULE_PIPELINE:
value: "true"
description: "Set to 'false' to disable schedule pipeline on a all jobs, useful to set it back on only some jobs."
ALLOW_TAG_PIPELINE:
value: "true"
description: "Set to 'false' to disable tag pipeline on a all push jobs."
RUN_EXTENSION_BENCHMARKS:
value: "false"
description: "Set to true to run benchmarks for kit extensions."
OMNI_CI_ENABLE_CXX_COVERAGE:
value: "false"
description: "Set to 'true' to enable C++ code coverage testing."
OMNI_CI_ENABLE_SANITIZERS:
value: "false"
description: "Set to 'true' to enable C++ sanitizer builds."
RUN_BUMP_VERSION:
value: "false"
description: "Set to true to run bump version. Only happens on schedule."
RUN_NIGHTLY_TESTS:
value: "false"
description: "Set to true to run nightly tests. Only happens on schedule."
RUN_DOCS_BUILD:
value: "true"
description: "Set to true to build omni docs. Only happens on schedule."


# ==============================================================================================================
.check-common:
stage: check
timeout: 20 minutes
interruptible: true
rules:
- if: $RUN_BUMP_VERSION == "true"
when: never
- !reference [.rules-workflow, rules]

.repo-artifacts:
artifacts:
when: always
expire_in: 2 weeks
paths:
- _repo/repo.log
- _repo/repolog*.txt


# ==============================================================================================================
# By default, all platforms (windows-x86_64, linux-x86_64) are published,
# but this can be changed in repo.toml config if necessary:
# [repo_publish_exts]
# platforms = ["linux-x86_64"]
verify-publish-extensions:
extends:
- .deploy-common
- .omni_nvks_runner_with_docker
script:
- ./repo.sh build --fetch-only -rd
- ./repo.sh publish_exts -a --from-package -c release --verify
- ./repo.sh publish_exts -a --from-package -c debug --verify
# - ./repo.sh ci publish_extensions
needs:
# We set all dependencies as optional just in case a platform is not needed,
# then the yml file can override both build/test on one platform and deploy will still work.
- job: build-windows-x86_64
artifacts: true
optional: false
- job: build-linux-x86_64
artifacts: true
optional: false
rules:
- if: $ALLOW_PUBLISH_EXTENSIONS != "true"
when: never
- if: $RUN_BUMP_VERSION == "true"
when: never
- !reference [.rules-push, rules]
# - !reference [.rules-version-changed, rules]


# ==============================================================================================================
# By default, all platforms (windows-x86_64, linux-x86_64) are published,
# but this can be changed in repo.toml config if necessary:
# [repo_publish_exts]
# platforms = ["linux-x86_64"]
publish-extensions:
extends:
- .deploy-common
- .omni_nvks_runner_with_docker
script:
- ./repo.sh build --fetch-only -rd
- ./repo.sh publish_exts -a --from-package -c release
- ./repo.sh publish_exts -a --from-package -c debug
# - ./repo.sh ci publish_extensions
needs:
# We set all dependencies as optional just in case a platform is not needed,
# then the yml file can override both build/test on one platform and deploy will still work.
- job: build-windows-x86_64
artifacts: true
optional: false
- job: build-linux-x86_64
artifacts: true
optional: false

rules:
- if: $ALLOW_PUBLISH_EXTENSIONS != "true"
when: never
- if: $RUN_BUMP_VERSION == "true"
when: never
- !reference [.rules-version-changed, rules]
- !reference [.rules-push-manual, rules]


# ==============================================================================================================
publish-docs:
rules:
- when: never
needs:


# ==============================================================================================================
publish-to-launcher:
rules:
- when: never
needs:

# ==============================================================================================================
release-new-version:
rules:
- when: never


# ==============================================================================================================
# update Kit SDK and extensions, merge master, typically done in daily branch
# set AUTOUPDATE_KIT=true for scheduled pipeline to run
autoupdate-kit:
rules:
- when: never
1 change: 1 addition & 0 deletions .lastformat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1714061207.6556504
35 changes: 35 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Contributing to the MJCF Importer Extension

## Did you find a bug?

* Check in the GitHub [Issues](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/issues) if a report for your bug already exists.
* If the bug has not been reported yet, open a new Issue.
* Use a short and descriptive title which contains relevant keywords.
* Write a clear description of the bug.
* Document the environment including your operating system, compiler version, and hardware specifications.
* Add code samples and executable test cases with instructions for reproducing the bug.

## Did you find an issue in the documentation?

* Please create an [Issue](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/issues/) if you find a documentation issue.

## Did you write a bug fix?

* Open a new [Pull Request](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/pulls) with your bug fix.
* Write a description of the bug which is fixed by your patch or link to related Issues.
* If your patch fixes for example Issue #33, write `Fixes #33`.
* Explain your solution with a few words.

## Did you write a cosmetic patch?

* Patches that are purely cosmetic will not be considered and associated Pull Requests will be closed.
* Cosmetic are patches which do not improve stability, performance, functionality, etc.
* Examples for cosmetic patches: code formatting, fixing whitespaces.

## Do you have a question?

* Search the GitHub [Discussions](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/discussions/) for your question.
* If nobody asked your question before, feel free to open a new discussion.
* Once somebody shares a satisfying answer to your question, click "Mark as answer".
* GitHub Issues should only be used for bug reports.
* If you open an Issue with a question, we may convert it into a discussion.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -193,7 +193,7 @@
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
https://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,
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
105.1
1.1.0
10 changes: 6 additions & 4 deletions deps/ext-deps.packman.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<project toolsVersion="5.6">
<project toolsVersion="5.0">
<!-- Import dependencies from Kit SDK to ensure we're using the same versions. -->
<import path="../_build/${platform}/${config}/kit/dev/all-deps.packman.xml">
<filter include="boost_preprocessor"/>
<filter include="imgui"/>
<filter include="nv_usd_py310_release"/>
</import>

<!-- Override the link paths to point to the correct locations. -->
<dependency name="boost_preprocessor" linkPath="../_build/target-deps/boost-preprocessor"/>
<dependency name="imgui" linkPath="../_build/target-deps/imgui"/>
<dependency name="nv_usd_py310_release" linkPath="../_build/target-deps/nv_usd/release"/>

<!-- Because we always use the release kit-sdk we have to explicitly refer to the debug usd package. -->
<dependency name="nv_usd_py310_debug" linkPath="../_build/target-deps/nv_usd/debug">
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-win64_py310_debug-merge_pxr_22-11-py310" platforms="windows-x86_64"/>
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-linux64_py310-centos_debug-merge_pxr_22-11-py310" platforms="linux-x86_64" />
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-linux-aarch64_py310_debug-merge_pxr_22-11-py310" platforms="linux-aarch64" />
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-win64_py310_debug-kit-release-integ-23-04-105-0-0" platforms="windows-x86_64" checksum="82b9d1fcd6f6d07cdff3a9b44059fb72d9ada12c5bc452c2df223f267b27035a" />
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-linux64_py310-centos_debug-kit-release-integ-23-04-105-0-0" platforms="linux-x86_64" checksum="4561794f8b4e453ff4303abca59db3a1877d97566d964ad91a790297409ee5d6"/>
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-linux-aarch64_py310_debug-kit-release-integ-23-04-105-0-0" platforms="linux-aarch64" checksum="b3c43e940fa613bd5c3fe6de7cd898e4f6304693f8d9ed76da359f04a0de8b02" />
</dependency>

<dependency name="tinyxml2" linkPath="../_build/target-deps/tinyxml2">
Expand Down
10 changes: 4 additions & 6 deletions deps/host-deps.packman.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<project toolsVersion="5.6">
<project toolsVersion="5.0">
<dependency name="premake" linkPath="../_build/host-deps/premake">
<package name="premake" version="5.0.0-alpha15.dev+pipeline3388156.1f299ea4-${platform}"/>
<package name="premake" version="5.0.0-beta2+nv1-${platform}"/>
</dependency>

<dependency name="msvc" linkPath="../_build/host-deps/msvc">
<package name="msvc" version="2019-16.7.6-license" platforms="windows-x86_64"/>
<package name="msvc" version="2019-16.11.17-2" platforms="windows-x86_64" />
</dependency>

<dependency name="winsdk" linkPath="../_build/host-deps/winsdk">
<package name="winsdk" version="10.0.18362.0-license" platforms="windows-x86_64"/>
<package name="winsdk" version="10.0.19608.0" platforms="windows-x86_64"/>
</dependency>
</project>
12 changes: 10 additions & 2 deletions deps/kit-sdk-deps.packman.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<project toolsVersion="5.6">
<project toolsVersion="5.0">
<!-- Import dependencies from Kit SDK to ensure we're using the same versions. -->
<import path="../_build/${platform}/${config}/kit/dev/all-deps.packman.xml">
<filter include="carb_sdk_plugins"/>
Expand All @@ -7,19 +7,23 @@
<filter include="python"/>
<filter include="client_library" />
<filter include="omni_usd_resolver" />
<filter include="nv_usd_py310_${config}" />
</import>

<!-- Import Physics plugins deps -->
<import path="../_build/target-deps/omni_physics/deps/target-deps.packman.xml">
<filter include="pxshared" />
<filter include="physx" />
<filter include="vhacd" />
</import>

<import path="../_build/target-deps/omni_physics/deps/schema-deps.packman.xml">
<filter include="usd_ext_physics_${config}" />
</import>

<!-- Override the link paths to point to the correct locations. -->
<dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
<dependency name="doctest" linkPath="../_build/target-deps/doctest"/>
<dependency name="nv_usd_py310_${config}" linkPath="../_build/target-deps/nv_usd/${config}" />
<dependency name="pybind11" linkPath="../_build/target-deps/pybind11"/>
<dependency name="python" linkPath="../_build/target-deps/python"/>
<dependency name="client_library" linkPath="../_build/target-deps/client_library" />
Expand All @@ -29,4 +33,8 @@
<dependency name="physx" linkPath="../_build/target-deps/physx" />
<dependency name="vhacd" linkPath="../_build/target-deps/vhacd" />
<dependency name="usd_ext_physics_${config}" linkPath="../_build/target-deps/usd_ext_physics/${config}" />

<import path="../_build/${platform}/${config}/kit/dev/deps/linbuild.packman.xml">
<filter include="linbuild" linkPath="../_build/host-deps/linbuild" tags="non-redist" />
</import>
</project>
Loading

0 comments on commit 326638c

Please sign in to comment.