Skip to content

Commit 8b7c8ba

Browse files
committed
add arch
1 parent 6d9f049 commit 8b7c8ba

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

.github/workflows/runTests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ jobs:
5959
command: addPaths; generateMexFromCpp; testScript
6060
- name: Create build archive (Windows and macOS)
6161
if: runner.os != 'Linux'
62-
run: tar --exclude="**/-lang:c++.zip" --exclude=".git*/" --exclude="htmlcov/" -acvf ../${{ runner.os }}.zip *
62+
run: tar --exclude="**/-lang:c++.zip" --exclude=".git*/" --exclude="**/codegen/" --exclude="htmlcov/" -acvf ../${{ runner.os }}-${{ runner.arch }}.zip *
6363
- name: Create build archive (Linux)
6464
if: runner.os == 'Linux'
65-
run: zip -r ../${{ runner.os }}.zip * -x "**/-lang:c++.zip" ".git*/" "htmlcov/*"
66-
- run: mv ../${{ runner.os }}.zip ${{ runner.os }}.zip
65+
run: zip -r ../${{ runner.os }}-${{ runner.arch }}.zip * -x "**/-lang:c++.zip" ".git*/" "htmlcov/*" "**/codegen/*"
66+
- run: mv ../${{ runner.os }}-${{ runner.arch }}.zip ${{ runner.os }}-${{ runner.arch }}.zip
6767
- name: Upload releases
6868
uses: actions/upload-artifact@v4
6969
with:
70-
name: ${{ runner.os }}
70+
name: ${{ runner.os }}-${{ runner.arch }}
7171
retention-days: 1
72-
path: ${{ runner.os }}.zip
72+
path: ${{ runner.os }}-${{ runner.arch }}.zip
7373

7474
deploy-nightly:
7575
if: github.ref == 'refs/heads/master'
@@ -85,7 +85,7 @@ jobs:
8585
- name: Create nightly release
8686
run: |
8787
output=$(gh release delete nightly --cleanup-tag --yes --repo ${{ github.repository }} 2>&1) || [[ "${output}" == "release not found" ]]
88-
gh release create nightly Windows.zip Linux.zip macOS.zip --prerelease --title "Nightly Build" --latest=false --repo ${{ github.repository }}
88+
gh release create nightly Windows-X64.zip Linux-X64.zip macOS-X64.zip macOS-ARM64.zip --prerelease --title "Nightly Build" --latest=false --repo ${{ github.repository }}
8989
env:
9090
GH_TOKEN: ${{ github.token }}
9191

compile/fullCompile/generateMexFromCpp.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
curPath = pwd;
12
root = getappdata(0, 'root');
3+
cd(fullfile(root,'compile','fullCompile'));
4+
25
mex_path = [fullfile(root, 'compile', 'fullCompile', 'codegen', 'mex', 'RATMain'), filesep];
36
mex_interface_path = [fullfile(mex_path, 'interface'), filesep];
47

@@ -27,8 +30,7 @@
2730
mex(includes{:}, 'COMPFLAGS=$COMPFLAGS /openmp -DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE -DMW_HAVE_LAPACK_DECLS -DMW_NEEDS_VERSION_H', main_file, sources{:}, '-output', 'RATMain_mex', '-v', '-llibemlrt', '-llibmwmathutil', '-lmwblas', '-lmwlapack')
2831
end
2932

30-
% Build custom file wrapper
31-
thisPath = pwd;
33+
% Build custom file wrapper
3234
cd(fullfile(root,'compile','customWrapper'));
3335
wrapperMexBuild;
34-
cd(thisPath);
36+
cd(curPath);

compile/reflectivityCalculation/reflectivityCalculationMexBuild.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
% Generates MEX-function (reflectivityCalculation_mex) from reflectivityCalculation.
44

55
% Create configuration object of class 'coder.MexCodeConfig'.
6-
% cfg = coder.config('mex');
7-
% cfg.GenerateReport = true;
8-
% cfg.EnableJIT = false;
9-
% cfg.EnableOpenMP = true;
10-
% cfg.TargetLang = 'C++';
6+
cfg = coder.config('mex');
7+
cfg.GenerateReport = true;
8+
cfg.EnableJIT = false;
9+
cfg.EnableOpenMP = true;
10+
cfg.TargetLang = 'C++';
1111

1212
% Define the input argument types..
1313
ARGS = makeCompileArgs();

0 commit comments

Comments
 (0)