Skip to content

fix: merge conflicts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 347 commits into from
Dec 21, 2023
Merged

fix: merge conflicts #1

merged 347 commits into from
Dec 21, 2023

Conversation

henilp105
Copy link

this PR resolves the merge conflicts for fortran-lang#879.

CC: @perazz

perazz added 30 commits April 21, 2023 17:31
@perazz
remove unnecessary verbosity
43b670e
@perazz
Revert "remove unnecessary verbosity"
8d6cc28 
This reverts commit 43b670e.
@perazz
fix run api
53719bf
@perazz
add ubuntu
b7c71e3
@perazz
unix -fpp macro fix
3632e1d
@perazz
base ifort implementation
831f284
@perazz
bump fortran-regex to 1.1.2 due to ifort issue
ecc2916
@perazz
add 'runner' task
f738753
@perazz
simplify compiler path search
60a33a2
@perazz
remove compiler prefix for C, C++
c2d444b
@perazz
fix linker flags for ifort with c/c++ main program
1cad824
@perazz
Merge branch 'main' into metapackages
929d9cf
@perazz
introduce ubuntu+intelmpi
f6e93ec
@perazz
install mpi sdk
13850e6
@perazz
install as sudo
f2aec4b
@perazz
use Intel Classic action
9b87b08
@perazz
use ifort compiler
a319e80
@perazz
export custom compiler via FPM_FC
557b5f7
@perazz
Update meta.yml
0eb4f7f
@perazz
Update meta.yml
0499185
@perazz
local env
cd3dd01
@perazz
Update meta.yml
9feec04
@perazz
Update meta.yml
c17c3ff
@perazz
Update meta.yml
a5ba917
@perazz
use $FC
0e24c34
@perazz
Update meta.yml
1269d72
@perazz
export all intel vars
20a3416
@perazz
IntelMPI: enable search via I_MPI_ROOT
b426f34
@perazz
use standard Intel compiler
1330d84
@perazz
intel-classic 2023.0
20d0b30
minhqdao and others added 26 commits June 22, 2023 13:23
@minhqdao
Merge pull request fortran-lang#948 from fortran-lang/clean-up-clean-…
ee397ac 
…command

Clean up clean command
@perazz
Merge branch 'main' into mpi_runner_onrunonly
d8efee4
@perazz
MPI: check presence of a runner command only with run and test ap…
3f511db 
…ps (fortran-lang#937)
@perazz
add preprocess_config to the dependency struct
e9cddad
@perazz
enable check for child node in toml, not only string values
c480ca1
@perazz
create simple test program
44076f4
@perazz
verify cached preprocessors
5550f5e
@perazz
compare preprocessing configs in the cached manifest
28c3fd9
@perazz
fix example macro input
011877f
@perazz
add package test to CI
e29f394
@perazz
fix unallocated preprocess in test
826b182
@perazz
cleanup
3df03c2 
cleanup
@perazz
fix unallocated targets array
69d3ea7
@perazz
Fix unallocated targets array (fortran-lang#954)
cfd77ce
@perazz
Dependency-level macro setting (fortran-lang#952)
39fdc09
@perazz
remove /en/ locale from paths
ce92996
@perazz
Fix broken links in README.md (fortran-lang#959)
6811dfe
@perazz
add -Ofast optimization flags for intel compiler (release profile)
3f98e65
@perazz
add flags also to ifx
6ebc226
@perazz
replace Ofast with O3
1a5ffb6
@perazz
Add -O3 optimization flags for Intel compiler, release profile (for…
498bc48 
…tran-lang#964)
@everythingfunctional
fix: make install script executable
268da22
@everythingfunctional
ci(meta-windows): try without gcc-fortran
c4d0e03
@everythingfunctional
Merge pull request fortran-lang#965 from everythingfunctional/fix-ins…
4c1a93f 
…tall-script

Make install script executable
@henilp105
Merge branch 'main' into fpm_model_perazz
86e17fb
@henilp105
fix
7999654
@perazz
Copy link
Owner

perazz commented Dec 21, 2023

LGTM, thank you for resolving these conflicts @henilp105.

@perazz perazz merged commit a1e71e9 into perazz:serialize_fpm_model Dec 21, 2023
@henilp105 henilp105 deleted the fpm_model_perazz branch February 1, 2024 14:57
perazz pushed a commit that referenced this pull request Jun 20, 2025
@krystophny
Merge pull request #1 from perazz/gcc15-fix
928fae3 
gcc-15 fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@henilp105 @perazz @gnikit @minhqdao @urbanjost @everythingfunctional