fix: merge conflicts #1

henilp105 · 2023-12-21T09:20:17Z

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

CC: @perazz

This reverts commit 43b670e.

…command Clean up clean command

…ps (fortran-lang#937)

cleanup

…tran-lang#964)

…tall-script Make install script executable

perazz · 2023-12-21T13:41:51Z

LGTM, thank you for resolving these conflicts @henilp105.

perazz added 30 commits April 21, 2023 17:31

remove unnecessary verbosity

43b670e

Revert "remove unnecessary verbosity"

8d6cc28

This reverts commit 43b670e.

fix run api

53719bf

add ubuntu

b7c71e3

unix -fpp macro fix

3632e1d

base ifort implementation

831f284

bump fortran-regex to 1.1.2 due to ifort issue

ecc2916

add 'runner' task

f738753

simplify compiler path search

60a33a2

remove compiler prefix for C, C++

c2d444b

fix linker flags for ifort with c/c++ main program

1cad824

Merge branch 'main' into metapackages

929d9cf

introduce ubuntu+intelmpi

f6e93ec

install mpi sdk

13850e6

install as sudo

f2aec4b

use Intel Classic action

9b87b08

use ifort compiler

a319e80

export custom compiler via FPM_FC

557b5f7

Update meta.yml

0eb4f7f

Update meta.yml

0499185

local env

cd3dd01

Update meta.yml

9feec04

Update meta.yml

c17c3ff

Update meta.yml

a5ba917

use $FC

0e24c34

Update meta.yml

1269d72

export all intel vars

20a3416

IntelMPI: enable search via I_MPI_ROOT

b426f34

use standard Intel compiler

1330d84

intel-classic 2023.0

20d0b30

minhqdao and others added 27 commits June 22, 2023 00:02

Clean up clean command

f87fac1

Merge pull request fortran-lang#948 from fortran-lang/clean-up-clean-…

ee397ac

…command Clean up clean command

Merge branch 'main' into mpi_runner_onrunonly

d8efee4

MPI: check presence of a runner command only with run and test ap…

3f511db

…ps (fortran-lang#937)

add preprocess_config to the dependency struct

e9cddad

enable check for child node in toml, not only string values

c480ca1

create simple test program

44076f4

verify cached preprocessors

5550f5e

compare preprocessing configs in the cached manifest

28c3fd9

fix example macro input

011877f

add package test to CI

e29f394

fix unallocated preprocess in test

826b182

cleanup

3df03c2

cleanup

fix unallocated targets array

69d3ea7

Fix unallocated targets array (fortran-lang#954)

cfd77ce

Dependency-level macro setting (fortran-lang#952)

39fdc09

remove /en/ locale from paths

ce92996

Fix broken links in README.md (fortran-lang#959)

6811dfe

add -Ofast optimization flags for intel compiler (release profile)

3f98e65

add flags also to ifx

6ebc226

replace Ofast with O3

1a5ffb6

Add -O3 optimization flags for Intel compiler, release profile (for…

498bc48

…tran-lang#964)

fix: make install script executable

268da22

ci(meta-windows): try without gcc-fortran

c4d0e03

Merge pull request fortran-lang#965 from everythingfunctional/fix-ins…

4c1a93f

…tall-script Make install script executable

Merge branch 'main' into fpm_model_perazz

86e17fb

fix

7999654

perazz merged commit a1e71e9 into perazz:serialize_fpm_model Dec 21, 2023
12 of 13 checks passed

henilp105 deleted the fpm_model_perazz branch February 1, 2024 14:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merge conflicts #1

fix: merge conflicts #1

henilp105 commented Dec 21, 2023

perazz commented Dec 21, 2023

fix: merge conflicts #1

fix: merge conflicts #1

Conversation

henilp105 commented Dec 21, 2023

perazz commented Dec 21, 2023