Skip to content

Commit

Permalink
Merge pull request #3 from rscohn2/dev/mkl
Browse files Browse the repository at this point in the history
fix mkl url
  • Loading branch information
rscohn2 authored Jan 24, 2023
2 parents 7c2bbd9 + 51faa78 commit 16b3737
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 363 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./
with:
components: icx
components: mkl
- name: Test install
run: |
source /opt/intel/oneapi/setvars.sh
13 changes: 13 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,17 @@ files. Default `true`.

Show the list of available components. Default `false`.

Developer Info
==============

Install ncc::

npm i -g @vercel/ncc
Compile the package::

ncc build -o dist/main src/main.js

Commit changes and push.

.. _example: https://github.com/rscohn2/test-setup-oneapi/blob/main/.github/workflows/main.yml
32 changes: 22 additions & 10 deletions dist/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44489,6 +44489,7 @@ class PropagationAPI {
constructor() {
this.createBaggage = utils_1.createBaggage;
this.getBaggage = context_helpers_1.getBaggage;
this.getActiveBaggage = context_helpers_1.getActiveBaggage;
this.setBaggage = context_helpers_1.setBaggage;
this.deleteBaggage = context_helpers_1.deleteBaggage;
}
Expand Down Expand Up @@ -44653,12 +44654,13 @@ exports.TraceAPI = TraceAPI;
* limitations under the License.
*/
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.deleteBaggage = exports.setBaggage = exports.getBaggage = void 0;
const context_1 = __nccwpck_require__(6938);
exports.deleteBaggage = exports.setBaggage = exports.getActiveBaggage = exports.getBaggage = void 0;
const context_1 = __nccwpck_require__(7846);
const context_2 = __nccwpck_require__(6938);
/**
* Baggage key
*/
const BAGGAGE_KEY = (0, context_1.createContextKey)('OpenTelemetry Baggage Key');
const BAGGAGE_KEY = (0, context_2.createContextKey)('OpenTelemetry Baggage Key');
/**
* Retrieve the current baggage from the given context
*
Expand All @@ -44669,6 +44671,15 @@ function getBaggage(context) {
return context.getValue(BAGGAGE_KEY) || undefined;
}
exports.getBaggage = getBaggage;
/**
* Retrieve the current baggage from the active/current context
*
* @returns {Baggage} Extracted baggage from the context
*/
function getActiveBaggage() {
return getBaggage(context_1.ContextAPI.getInstance().active());
}
exports.getActiveBaggage = getActiveBaggage;
/**
* Store a baggage in the given context
*
Expand Down Expand Up @@ -46115,7 +46126,7 @@ const contextApi = context_1.ContextAPI.getInstance();
*/
class NoopTracer {
// startSpan starts a noop span.
startSpan(name, options, context) {
startSpan(name, options, context = contextApi.active()) {
const root = Boolean(options === null || options === void 0 ? void 0 : options.root);
if (root) {
return new NonRecordingSpan_1.NonRecordingSpan();
Expand Down Expand Up @@ -46888,7 +46899,7 @@ var TraceFlags;
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.VERSION = void 0;
// this is autogenerated file, see scripts/version-update.js
exports.VERSION = '1.3.0';
exports.VERSION = '1.4.0';
//# sourceMappingURL=version.js.map

/***/ }),
Expand Down Expand Up @@ -63579,8 +63590,8 @@ const componentUrls = {
ippcp: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18999/l_ippcp_oneapi_p_2021.6.2.15006_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18999/l_ippcp_oneapi_p_2021.6.2.15006_offline.sh',

mkl: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19035/l_onednn_p_2022.2.1.16994_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19035/l_onednn_p_2022.2.1.16994_offline.sh',
mkl: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19038/l_onemkl_p_2022.2.1.16993_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19038/l_onemkl_p_2022.2.1.16993_offline.sh',

tbb: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19041/l_tbb_oneapi_p_2021.7.1.15005_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19041/l_tbb_oneapi_p_2021.7.1.15005_offline.sh',
Expand Down Expand Up @@ -63621,9 +63632,10 @@ async function prune () {
if (!core.getBooleanInput('prune')) { return }

const dirs = ['/opt/intel/oneapi/compiler/latest/linux/compiler/lib/ia32_lin',
'/opt/intel/oneapi/compiler/latest/linux/bin/ia32',
'/opt/intel/oneapi/compiler/latest/linux/lib/emu',
'/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga']
'/opt/intel/oneapi/compiler/latest/linux/bin/ia32',
'/opt/intel/oneapi/compiler/latest/linux/lib/emu',
'/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga',
'/opt/intel/oneapi/mkl/latest/lib/intel64/*.a']

console.log('Pruning oneapi install')
await exec.exec('du', ['-sh', '/opt/intel/oneapi'])
Expand Down
8 changes: 4 additions & 4 deletions node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 9 additions & 32 deletions node_modules/@opentelemetry/api/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions node_modules/@opentelemetry/api/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@actions/github": "^5.1.1",
"@actions/io": "^1.1.2",
"@actions/tool-cache": "^2.0.1",
"@opentelemetry/api": "^1.4.0",
"uuid": "^9.0.0"
}
}
11 changes: 6 additions & 5 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const componentUrls = {
ippcp: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18999/l_ippcp_oneapi_p_2021.6.2.15006_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18999/l_ippcp_oneapi_p_2021.6.2.15006_offline.sh',

mkl: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19035/l_onednn_p_2022.2.1.16994_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19035/l_onednn_p_2022.2.1.16994_offline.sh',
mkl: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19038/l_onemkl_p_2022.2.1.16993_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19038/l_onemkl_p_2022.2.1.16993_offline.sh',

tbb: 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19041/l_tbb_oneapi_p_2021.7.1.15005_offline.sh',
'[email protected]': 'https://registrationcenter-download.intel.com/akdlm/irc_nas/19041/l_tbb_oneapi_p_2021.7.1.15005_offline.sh',
Expand Down Expand Up @@ -79,9 +79,10 @@ async function prune () {
if (!core.getBooleanInput('prune')) { return }

const dirs = ['/opt/intel/oneapi/compiler/latest/linux/compiler/lib/ia32_lin',
'/opt/intel/oneapi/compiler/latest/linux/bin/ia32',
'/opt/intel/oneapi/compiler/latest/linux/lib/emu',
'/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga']
'/opt/intel/oneapi/compiler/latest/linux/bin/ia32',
'/opt/intel/oneapi/compiler/latest/linux/lib/emu',
'/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga',
'/opt/intel/oneapi/mkl/latest/lib/intel64/*.a']

console.log('Pruning oneapi install')
await exec.exec('du', ['-sh', '/opt/intel/oneapi'])
Expand Down
Loading

0 comments on commit 16b3737

Please sign in to comment.